From patchwork Mon Feb 28 00:16:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12762228 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: , 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 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. diff --cc arch/arm/Kconfig index 72150cb8db02,d9142ad18c52..000000000000 --- a/arch/arm/Kconfig