From patchwork Mon Feb 19 03:39:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 202891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1063747dyc; Sun, 18 Feb 2024 19:40:16 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVO23tPaCgUJHu5ASHWQe/5YqFPfNTatbxQAmj1TWNVLm5kFzNpGFH+C5qXPoyebaJlDYBTxvKpcflkuu4Sg1Z0lutUFQ== X-Google-Smtp-Source: AGHT+IG87rODP8oi9avxp5HofOtapPo8eAaEeXbQnlGNSfv85xCQx6H3+URadLEfkuJJrTlA1ceD X-Received: by 2002:a17:907:7088:b0:a3e:60b8:46c6 with SMTP id yj8-20020a170907708800b00a3e60b846c6mr1702242ejb.18.1708314016051; Sun, 18 Feb 2024 19:40:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708314016; cv=pass; d=google.com; s=arc-20160816; b=kKqyNXc+DEJutS3799IoggoWP7WaQvXy9Fz57h1LSxiSs7x3saO6y6KqwpUtDM3/5R bY5VtKxuIPNzKPmHT0xqkmR01Q7jU2lul8mLP0U3i/cAx0uoJ2ExxS41aGp0/ldfK7ko EyHmq4Oh+b39BdrIp1t9grdAAWC+wW+9yOlWP/UpHX7gTJVX7JymhcrFdA81z8WijBtu ngrV0KEwCL4yQGgf0AFOI27JoSOIvwmzjAUQZa5+jJoObGPe5BpfHO0EPmD4X4AV0be/ T3hQB3kw70zmTFuqrUv57g/bB4c/HbSe6g14DK5KTcoe2mPuvZ7bE+0kEXcttmCF9nQk D7xg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=TBNt9NsUlQ6Z+jk7YwoAOPS6chuqkcUdtoSLrtBERHs=; fh=qO9xNZMG3ZyN1veVsRQeP96Z/UtKrAfzXW7V/iP11L0=; b=KvX/Xs/NDZrIaI3iKYsDAIGHk9SI5CHLIFAsPptUuxiwFdnOJwgQnT3tNV0o9XKGuC ISszwQRmw5cgchsmCXVIzIZMSwCprzs//OWoFetlJ4yfyv5iBISu4p4XsZjLX89Vo3AJ vGHTQ8JdYOtJXgDJWizKbOAl+loqmDLsH5yYHtIH8SN351XMvwERYLVMmJmnZ0HUJILt X7Ad4YZNeqLBeqNrcYqLKtnrKFKxbK31wqlZdTS84i7PsrAlgKJ4L95RQjlr3PV9GDvj aQ7gH8xCOc099iQxC6QY/ExKxM6qYjGxVODA6UeyCabiJKEDxXBWtJ+iAptpD3/ibKBQ 8F7A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=qcvh9G49; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70681-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id qw12-20020a1709066a0c00b00a3eaca5a768si228972ejc.741.2024.02.18.19.40.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 19:40:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-70681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=qcvh9G49; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70681-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id AB4A91F22106 for ; Mon, 19 Feb 2024 03:40:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 01C85125DA; Mon, 19 Feb 2024 03:39:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="qcvh9G49" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F387C15A; Mon, 19 Feb 2024 03:39:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708313992; cv=none; b=XaK+/OXGPzatee6LumX0xkw2N4cPoZ0yIVplM3Wl8HDDxUx6pgFpmLWpgrOe/x2E5PKKrTDgCAWHdWLMIAQm4NU9EuGyOe82kibfhC5UbUc+R9O/5V83LOLm+WJv2aaSIg7LTneuANNO+fyxnbCV854lodZWns2yG0kDoqToxe8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708313992; c=relaxed/simple; bh=fxhi+GqlErvj/43tcOJamSImC1DKThuSTHYdimhH9l0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=aa2darkmF2+uF1gXR1/VdAXAB+l5GKYjSPWOvKxfstS4abH8novAilTgHUS+ITC5BbptWwkRdj2BVEzGhsle0QS3ZpdznWRoyveMMOXIRVt1oSmh5QU11svHIQQeQ29wTZIYSO2LXR/9/Ajmw66BIdwA+mkhj8J0rHwdCoXX5I0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=qcvh9G49; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708313987; bh=TBNt9NsUlQ6Z+jk7YwoAOPS6chuqkcUdtoSLrtBERHs=; h=Date:From:To:Cc:Subject:From; b=qcvh9G49iWJ6vri1aZVNujcfSuhdLYDD4AfCGl0gtLDQal85rPvOgJfiCnpfGFL3d UfdUxZDOKCQ9NWShfUxF501nSpT23hPdNYYP5HT8vuUa6iXpLJ5Km9gj82yWSO69ia JuGgTMDUalJJJMbeH/cvD6XtlMR8UntC9sBUwI+LC47QUK/W//AovHtCbpaHR88ftO Lcff0HV945m/M/WS4SCppNhpEHDa1WzBqn0oZ5BZI5+mYAe+KiVBsb0/tDNg7ZtO3r a4tCj/InbA4WP4Dd24Sf+9y+iBH0BQQJIpCbkpIZFAp6pCeW1tjScbaYm7kh+wubdj bLNQjgbO0PSjQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4TdSw30zm5z4wcK; Mon, 19 Feb 2024 14:39:46 +1100 (AEDT) Date: Mon, 19 Feb 2024 14:39:45 +1100 From: Stephen Rothwell To: Jonathan Cameron Cc: Linux Kernel Mailing List , Linux Next Mailing List , Nuno Sa , Olivier Moysan , Rob Herring Subject: linux-next: manual merge of the iio tree with Linus' tree Message-ID: <20240219143945.1460f25f@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791297077544924604 X-GMAIL-MSGID: 1791297077544924604 Hi all, Today's linux-next merge of the iio tree got a conflict in: drivers/of/property.c between commit: 8f7e91790738 ("of: property: fix typo in io-channels") from Linus' tree and commit: fd4464d218d5 ("of: property: add device link support for io-backends") from the iio tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/of/property.c index a4f11b2f4ff0,ec914e4516d7..000000000000 --- a/drivers/of/property.c