From patchwork Fri May 6 02:39:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12840481 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 B2D17C433EF for ; Fri, 6 May 2022 02:40:29 +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=k8E2XANNMTqAXqqy9pcbat6KaK3GxCJwDqCu2nPpBQQ=; b=o9Y +sw5b05KwaWjV2Uvnd1EZmcEhD9nlsnEy89rUt3IKzvA7X4YIUnLFr8hQkCRhu7cYxxLCGrgWXyXP aqEReUPg3DuKvc4A31W/dlrwP2yEerVIeDNoCTcMRhQw0ZXu3q0qskfwrN1tBHQvf1vPgNDZx8gT/ S2cfX85nufM6gGQWCQLA13tZ+gDB/K8Hq54DXxJgADKNHKv6RBfwFTfg2ok4KKT1DP5iia1erHhUC FLASipPZnFDNkAK5A7cLSxpmFj6w8Fm3UXWEU3Y1QpqMILGEe7dT1qg5kLrhUbvaAtMWsrEmRlHXj gaeZPL4gAZ+QzL9yYNwhRZaKD3JaNpw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmnsJ-00107P-5R; Fri, 06 May 2022 02:39:23 +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 1nmnsF-00105z-NI for linux-arm-kernel@lists.infradead.org; Fri, 06 May 2022 02:39:21 +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 4KvZWz6dgCz4xXS; Fri, 6 May 2022 12:39:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1651804754; bh=1Ilo05scNIwalNfyaTyXng6aFmzopQdKNcSB0fD7WfY=; h=Date:From:To:Cc:Subject:From; b=AF/xXeiEX5JHJOrCdc73ODupfntyVbcSVyuf9Wnk4DMR8Mw1E3zcdpJvy8Mq9ui6I /JmH5wW+3v2oyCuezFdlxKR1KztHEOSUazRExHrSOx9NJZdzGTiobp9O9jJF+2PkR/ e0edBpbNk2UWZQqtGur4USBCNaR1LeigrlwOH3pDQVUAnN0gSU6M/KV4OaI8BMNHgj frzePQ+9VghUr+NIUYDuYfTuBKBZJpDXNFDacFCpTlMWtOu4xOCx8ujMpH8j5h6OtW GpMPxCwdpAPWLz74KUVytt0BRmBR8+MjBlckAHCvVc27aDM04RZT+6I5MfVbZqgUC4 +NdD5E4mY0bdw== Date: Fri, 6 May 2022 12:39:10 +1000 From: Stephen Rothwell To: Joerg Roedel , Olof Johansson , Arnd Bergmann Cc: ARM , Joerg Roedel , Linux Kernel Mailing List , Linux Next Mailing List , Sven Peter Subject: linux-next: manual merge of the iommu tree with the arm-soc tree Message-ID: <20220506123910.3faae09f@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220505_193920_078625_C511F88B X-CRM114-Status: GOOD ( 15.17 ) 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 iommu tree got a conflict in: MAINTAINERS between commit: a12d521f4a3d ("dt-bindings: iommu: Add Apple SART DMA address filter") from the arm-soc tree and commit: ee5354345242 ("MAINTAINERS: Merge DART into ARM/APPLE MACHINE") from the iommu 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 83a61d719d95,7d728a19e857..000000000000 --- a/MAINTAINERS