From patchwork Tue Jan 17 01:25:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13104012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5A3CC678D4 for ; Tue, 17 Jan 2023 01:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=D6+5A9hqfaLmKAh7RClIAn1/kklYDz5Gb39TD08A77g=; b=Wrh fmM7RREP+oIByqFjtmTJ5ZFdTxe0h818rOG914HQDuSFrWL7eW1PIw5X+i9fg3D6RiwF6BmwC9XTF CVhjg5S+6NjyxxamNeT+NN5V2mn9Qk3Okv4c0XmaIrl5Wdh0MIDtcEhE7uaoDQPuUzJ1xzmGbZQIX kp7wKZAqKuu1TUimw3nQu6A7oSKMbGr/lXCLmwesGJ7KOJY81wIZeAyQ2y47AW+HRtdousCRxlDZu d8TNEAN6J2WISPleuj5Gd/v4in1/A22EfzdeBufD5yAU+tSeMZF4JUHdu5VbnheQLirljYoAF1nSG X07StasgiGC73PZs2WP/jzKlzNC6WOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHak1-00CTl6-VH; Tue, 17 Jan 2023 01:26:22 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pHajx-00CTjc-RA for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2023 01:26:19 +0000 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NwrnF5bvXz4xG5; Tue, 17 Jan 2023 12:25:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1673918756; bh=L5BxRwBIjGaxgwaMH9MFPPUWp51rN4zJLW/6C/Yr0hI=; h=Date:From:To:Cc:Subject:From; b=dJBZP7tkWgk72jNAUI7VGH1PsvtUbpuA0Dh0eYXB7uuVPAeK5GCF5wan0APnSQH/V bBVUqNUmz9ljQKEwEGsrHAkNX+/7lGwJM/d16oj2bYAzZEZ/43O+xpdALy8z0+94lF u/NpT42nwGLxrGJ2sGJtlLsF7xTmDUfK2j/pIHBaGb15LS2Jn9Sw2Hl8WLbmfgeMPE EWusflkX3cXtiXOXQ7ZVjm4lDBevXtGcLPXS+UcN55qn1avdqfU6KcsAD7CmrViO1n fnW2Sbc4TpAJb1PvkTwTsnL7fl8bXQRusWAn6oQ5BrRKGxXkB2eBBFTIr5ANoJFN6Z LSTDSkJbTQmcw== Date: Tue, 17 Jan 2023 12:25:52 +1100 From: Stephen Rothwell To: Jonathan Cameron , Olof Johansson , Arnd Bergmann Cc: ARM , Alexander Sverdlin , Linux Kernel Mailing List , Linux Next Mailing List , Lukas Bulwahn Subject: linux-next: manual merge of the iio tree with the arm-soc tree Message-ID: <20230117122552.64f70650@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230116_172618_062119_530E1381 X-CRM114-Status: GOOD ( 16.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the iio tree got a conflict in: MAINTAINERS between commit: 59ce53421673 ("MAINTAINERS: update file entries after arm multi-platform rework and mach-pxa removal") from the arm-soc tree and commit: 08025a3bd9e0 ("dt-bindings: iio: adc: ep93xx: Add cirrus,ep9301-adc description") 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 MAINTAINERS index 390d79c20a59,9ff472ca1244..000000000000 --- a/MAINTAINERS