From patchwork Mon Nov 1 02:51:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12595611 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C33FC433F5 for ; Mon, 1 Nov 2021 02:53:39 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4C04A603E5 for ; Mon, 1 Nov 2021 02:53:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4C04A603E5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=918+Vf5I/M1Zaf/ukinac7oLZGCCKdkgE1FmaJ+Y3QQ=; b=aT/ ZAszX9SXm7hnet1e93zoaqCRU74jn4JQ6u0RkiGD9sH1kiZZw5NLJtY3v/IjJUtgaEaIviBqrTvM6 FyBX6nNxGd7vRhN01rPobrrIeovDL87OlXnVFrw6F59Qf9CwpMDuyjJBpcuemNhruOU6n5xovXYfS qAGBtj9XJCrkt4ymE3HwLpm167gR1pzKqLpIeyb9Q8aEj6IT0rJCFB1i1ZQmQorWuUo7xOgasGwkS hKIfp6taG6fOefy6GqalnOkIehUKtJxxZNMRgvQTYqhZl+jKr2rEHJBjCZU0EkMRk0DmIloU35bw/ xs+jI9AXXkkB9EzCg5Ne9XZ3M1PyLZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mhNQc-00F8BM-00; Mon, 01 Nov 2021 02:52:06 +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 1mhNQX-00F89x-OW for linux-arm-kernel@lists.infradead.org; Mon, 01 Nov 2021 02:52:03 +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 4HjHcB2t0Xz4xbC; Mon, 1 Nov 2021 13:51:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1635735102; bh=CcJraMUYFIdN8BoImcFcde7fMSGugo71oB6ZjBy0J6w=; h=Date:From:To:Cc:Subject:From; b=iWY+tXQqHfHK8QF+aaqj/NRdA6bLfHtziGfKGhGQ8LJTWEc6JQRLClXSNFngbEX19 o5ZET9YFA0CN/Ufv1lFz8u6B0BRutN/YJUpIxCz88a0xyjjdEfvt/h2nFqPSM+qHv2 ul8X/PtPkF17bTVLEvoq1YpdepL8X2TFsvWvqgM+jKb40lfuIxJb/DsQJ8iSjJL18b 4k+4qinUCJMQHJ+92VW5iawYdJ0V1O52Cki9+vVUpzgLHQQ8JX/J9ZZTcfj8sXi0ji dLEJTUPz6dhsOST1Xmy2XAcj2K+JCcbHP5QD4WDhwoVl86G4hNWu+sRbbrZhVCuJsu kDvNX40qfCBcQ== Date: Mon, 1 Nov 2021 13:51:35 +1100 From: Stephen Rothwell To: Jassi Brar , Olof Johansson , Arnd Bergmann , ARM , Rob Herring Cc: Hector Martin , Joey Gouly , Linux Kernel Mailing List , Linux Next Mailing List , Mark Kettenis , Rob Herring , Sven Peter Subject: linux-next: manual merge of the mailbox tree with the arm-soc, devicetree trees Message-ID: <20211101135135.395b6ad8@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211031_195201_997255_C796E804 X-CRM114-Status: GOOD ( 15.11 ) 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 mailbox tree got a conflict in: MAINTAINERS between commits: a3b539fedc09 ("dt-bindings: pci: Add DT bindings for apple,pcie") e081c53a5ba1 ("MAINTAINERS: add pinctrl-apple-gpio to ARM/APPLE MACHINE") from the arm-soc, devicetree trees and commit: 7feea290e9f4 ("MAINTAINERS: Add Apple mailbox files") from the mailbox 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 244002eb7220,333eff21b8d2..000000000000 --- a/MAINTAINERS