From patchwork Wed Nov 6 22:45:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11231309 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6B061575 for ; Wed, 6 Nov 2019 22:46:09 +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 BD169217D7 for ; Wed, 6 Nov 2019 22:46:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="K4umaprH"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="rLZM9R01" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD169217D7 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=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject: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=86D7ozoUf8fULSlwJOeD1t7Tw1YeKuHOGZ1teVtZRiM=; b=K4u maprHyztdw9/ELINhVLRlEaqpOj099IyQ8IGE952RlFJDW4mTMwvygk5DaZu57LUImpSx1yXlH5SK 4FjkbI9amhrsdfInuMUPFXLcXfEKTDBnLkriau0Xs5YLgPeLej2uDmQ0vNDr/FZN4LIO2Kq2b1mHb lr+AEAUUQCnkM5eHJAs7EbYfUQCIETUMiXVODnXvbG6PMI01D5aa9dhmspJm5Bcu0U5LdhnMj7Z+j K/QovsP9SgikHAn1LRfrLEgDITOEb5td3TeWVqsx1T0/ato1Qsl9Nfnmdhzgwb4n0eaZ2w1iBXzbL PLy5+kHDj/32YdCZzumaP0mrm43ts1Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSU40-00043u-HY; Wed, 06 Nov 2019 22:46:08 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iSU3x-00042v-BA for linux-arm-kernel@lists.infradead.org; Wed, 06 Nov 2019 22:46:07 +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 477hTJ51wWz9sP3; Thu, 7 Nov 2019 09:45:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1573080358; bh=+XwusxsL0b4rJBumGPAzaru0IjxloMP02YE8X8kLabo=; h=Date:From:To:Cc:Subject:From; b=rLZM9R01VqV7vgXOwFbsOeF67bN/WIoz/XjxhJHxjXsf5MMzeYoPJX8x9VBP9DGCt ZTdQDaXK5fcRKzIJmWnQcPLPI4RtfkEMrOiISWci3m159I0wOmpUhn/zfNbH+FLtiW BNo6AgPyOPsgVJDzcwGXom+j5WzDPafsCOYLjGw0b5mljlguia+6p8mf2aIoqPwBUg yb4jlPWvHNJhO1zYHTKk84AzaXBCj+hS0zKb3nEolOEbW3SkHjLgefMnLDSAZndLa0 5uEgN05cqImpGB4YsLppF3q13bKXt8miBMeF2pnBoEdrCCdEXOzlvR4O4qFlgWVbG5 k3X9bb9Mbc7ig== Date: Thu, 7 Nov 2019 09:45:55 +1100 From: Stephen Rothwell To: Bjorn Helgaas , Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: manual merge of the pci tree with the arm-soc tree Message-ID: <20191107094555.6296b943@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191106_144605_549259_C0BE07EA X-CRM114-Status: UNSURE ( 9.38 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.4 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [2401:3900:2:1:0:0:0:2 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Xiaowei Bao , Shawn Guo , Hou Zhiqiang , Linux Kernel Mailing List , Linux Next Mailing List , Fabio Estevam Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the pci tree got a conflict in: arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi between commit: 68e36a429ef5 ("arm64: dts: ls1028a: Move thermal-zone out of SoC") from the arm-soc tree and commit: 8d49ebe713ab ("arm64: dts: ls1028a: Add PCIe controller DT nodes") from the pci 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/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 8e8a77eb596a,71d7c6949b9e..000000000000 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi