From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C572EC433FE for ; Mon, 28 Feb 2022 00:16:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231234AbiB1ARA (ORCPT ); Sun, 27 Feb 2022 19:17:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229662AbiB1AQ5 (ORCPT ); Sun, 27 Feb 2022 19:16:57 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B006260CDF; Sun, 27 Feb 2022 16:16:18 -0800 (PST) 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 4K6LWy4f6Dz4xbw; Mon, 28 Feb 2022 11:16:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1646007376; bh=hH17aUcIFirXuu3qRlWLoyirY8kZuh415CPZTH2yVG4=; h=Date:From:To:Cc:Subject:From; b=VjFA1yCVId+N3r2dOrKaQbKsUIYKxNkyATHP/X1Xs7CTbZhcAG1OtcoPvo3e7GO12 roG526ZDZEp6jvS0auJwMf59+3SBZAYRXYjGkvgIjLZOgOKhy2CIRDLbYIpVYlZP9e yx8xvkMPAo0PCUqC1v8i4tsM6oFIXn0mXeX+jXkUY1+0HSekGTPXFFS/a53B1kvByN e6OugKYfWWMuf9qGUnc8jyMROTNM+R65KPEVjwHKkVyfD9zCPyWRNzjGl0UuRz+xxi 2vBD5zkCxx4k6AS4ucJYzwVIgsk6PZ2+q1dWOlKlwofptsulYvjXgHTnFaR5wyaCpR ZDCKcNRXVbFTQ== Date: Mon, 28 Feb 2022 11:16:13 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM , Russell King Cc: Ard Biesheuvel , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the arm-soc tree with the arm tree Message-ID: <20220228111613.1e299554@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/P/W2lPhzpdDVvBaPNPKt7AW"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/P/W2lPhzpdDVvBaPNPKt7AW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/Kconfig between commit: 54f481a2308e ("ARM: remove old-style irq entry") from the arm tree and commit: 00ba9357d189 ("ARM: ixp4xx: Drop custom DMA coherency and bouncing") from the arm-soc 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. --=20 Cheers, Stephen Rothwell diff --cc arch/arm/Kconfig index 72150cb8db02,d9142ad18c52..000000000000 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -389,10 -379,10 +386,9 @@@ config ARCH_IOP32 config ARCH_IXP4XX bool "IXP4xx-based" depends on MMU - select ARCH_HAS_DMA_SET_COHERENT_MASK select ARCH_SUPPORTS_BIG_ENDIAN + select ARM_PATCH_PHYS_VIRT select CPU_XSCALE - select DMABOUNCE if PCI - select GENERIC_IRQ_MULTI_HANDLER select GPIO_IXP4XX select GPIOLIB select HAVE_PCI --Sig_/P/W2lPhzpdDVvBaPNPKt7AW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIcFE0ACgkQAVBC80lX 0Gyr+gf+NnhPyTYlY0KGQyt15/KvnqBcvWEhZ6GMEEtzsqqsh5RleJc7NKbsVHAm fvaiyKrSMNUJBBab9hdXVDP1K+tPkfrVOaaILWWxeTNRVqhgNTt/RGmlpX1s6Fmv 5tXXsaGg2UyBjrScEJb3TKe4VznkvkE7aG8QFHXvWPMFVQq1KnGFrwVuh23dBtnI e9o9IMBmANPOs7LdUYwUeA9E731F58tekSm0vMUv2eLMiIgBtnlzSOJ3NaEeS1io kq5WsHZ0mbWoz+SA4QzcLmNQRPK6Uv/+mZCP2QsZc3it7uV+Ind2F8tc4lHdgboD HlMy00vDQ/0ZaFhmN6yfedva4nF1JA== =B7DU -----END PGP SIGNATURE----- --Sig_/P/W2lPhzpdDVvBaPNPKt7AW-- From mboxrd@z Thu Jan 1 00:00:00 1970 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 DDFBBC433F5 for ; Mon, 28 Feb 2022 00:17:57 +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=eOS3akKFq3hMoPYmiROwCwoeByZiLfky63OZWEus+Iw=; b=DJM nBtbxe2t7BKJtRN5f6X2XP6tRM+xRfE+t3qigmO9txIvrl7ML3p5jkmvb2kZLDG1pcsQqOhM5pzeY 1D3euRKPaFpOyvd+jAEsuNB/xJoQbx9cfoN0olAORJvA+xgoy2W61iV9RsJs70zAcekNXGdUaryXT zyYp89ep/vrcKLifJIYCl4eQGhas3AalxAGUFZ11lstXmAiEixaqOGI+cwfV1fZIDyhipwhYECjZL /aA1Nq2/1hokplHG2MIAXhjwY/37EHtCmgBhmwmzELIR7JatY3WK0pAWryzxNlSnkpLjFqssQe/AO K7Ofo98fQOeQvefIfx6EEPYGo4cytaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOTiF-00AOYQ-S6; Mon, 28 Feb 2022 00:16:27 +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 1nOTiB-00AOXW-Tv for linux-arm-kernel@lists.infradead.org; Mon, 28 Feb 2022 00:16:25 +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 4K6LWy4f6Dz4xbw; Mon, 28 Feb 2022 11:16:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1646007376; bh=hH17aUcIFirXuu3qRlWLoyirY8kZuh415CPZTH2yVG4=; h=Date:From:To:Cc:Subject:From; b=VjFA1yCVId+N3r2dOrKaQbKsUIYKxNkyATHP/X1Xs7CTbZhcAG1OtcoPvo3e7GO12 roG526ZDZEp6jvS0auJwMf59+3SBZAYRXYjGkvgIjLZOgOKhy2CIRDLbYIpVYlZP9e yx8xvkMPAo0PCUqC1v8i4tsM6oFIXn0mXeX+jXkUY1+0HSekGTPXFFS/a53B1kvByN e6OugKYfWWMuf9qGUnc8jyMROTNM+R65KPEVjwHKkVyfD9zCPyWRNzjGl0UuRz+xxi 2vBD5zkCxx4k6AS4ucJYzwVIgsk6PZ2+q1dWOlKlwofptsulYvjXgHTnFaR5wyaCpR ZDCKcNRXVbFTQ== Date: Mon, 28 Feb 2022 11:16:13 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM , Russell King Cc: Ard Biesheuvel , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the arm-soc tree with the arm tree Message-ID: <20220228111613.1e299554@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220227_161624_191118_845B58AD X-CRM114-Status: GOOD ( 15.20 ) 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: , Content-Type: multipart/mixed; boundary="===============3895997588549616947==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============3895997588549616947== Content-Type: multipart/signed; boundary="Sig_/P/W2lPhzpdDVvBaPNPKt7AW"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/P/W2lPhzpdDVvBaPNPKt7AW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm/Kconfig between commit: 54f481a2308e ("ARM: remove old-style irq entry") from the arm tree and commit: 00ba9357d189 ("ARM: ixp4xx: Drop custom DMA coherency and bouncing") from the arm-soc 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. --=20 Cheers, Stephen Rothwell diff --cc arch/arm/Kconfig index 72150cb8db02,d9142ad18c52..000000000000 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -389,10 -379,10 +386,9 @@@ config ARCH_IOP32 config ARCH_IXP4XX bool "IXP4xx-based" depends on MMU - select ARCH_HAS_DMA_SET_COHERENT_MASK select ARCH_SUPPORTS_BIG_ENDIAN + select ARM_PATCH_PHYS_VIRT select CPU_XSCALE - select DMABOUNCE if PCI - select GENERIC_IRQ_MULTI_HANDLER select GPIO_IXP4XX select GPIOLIB select HAVE_PCI --Sig_/P/W2lPhzpdDVvBaPNPKt7AW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIcFE0ACgkQAVBC80lX 0Gyr+gf+NnhPyTYlY0KGQyt15/KvnqBcvWEhZ6GMEEtzsqqsh5RleJc7NKbsVHAm fvaiyKrSMNUJBBab9hdXVDP1K+tPkfrVOaaILWWxeTNRVqhgNTt/RGmlpX1s6Fmv 5tXXsaGg2UyBjrScEJb3TKe4VznkvkE7aG8QFHXvWPMFVQq1KnGFrwVuh23dBtnI e9o9IMBmANPOs7LdUYwUeA9E731F58tekSm0vMUv2eLMiIgBtnlzSOJ3NaEeS1io kq5WsHZ0mbWoz+SA4QzcLmNQRPK6Uv/+mZCP2QsZc3it7uV+Ind2F8tc4lHdgboD HlMy00vDQ/0ZaFhmN6yfedva4nF1JA== =B7DU -----END PGP SIGNATURE----- --Sig_/P/W2lPhzpdDVvBaPNPKt7AW-- --===============3895997588549616947== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============3895997588549616947==--