From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019AbcFUIzB (ORCPT ); Tue, 21 Jun 2016 04:55:01 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63086 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751853AbcFUIyz (ORCPT ); Tue, 21 Jun 2016 04:54:55 -0400 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Stephen Rothwell , David Miller , netdev@vger.kernel.org, Olof Johansson , Florian Fainelli , Pramod Kumar , linux-kernel@vger.kernel.org, Yendapally Reddy Dhananjaya Reddy , linux-next@vger.kernel.org, Jon Mason Subject: Re: linux-next: manual merge of the net-next tree with the arm-soc tree Date: Tue, 21 Jun 2016 10:56:21 +0200 Message-ID: <4384645.F021K1OoaK@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <20160621111839.34936836@canb.auug.org.au> References: <20160621111839.34936836@canb.auug.org.au> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:Q3eY9xNI7GXQHot7E7n30Pj3UXp3TcdBkglurP0jJNGbTvRFYzu 2avLRASwrL0VxIwYqBXe/GolW6scDWcW8bK8U7InOgUxMcHOpAynkbtKPiG4SPPa2WgNQKR wwb441Qs+k3pq1IyBXPVLTLQEklow+WOAH8WmA5DC+mHyOmjAXZ9LUrcKNfpl6MJcjKLtkM t0dkEKocYFyPR/FRwFYaw== X-UI-Out-Filterresults: notjunk:1;V01:K0:MQ3AB9My1g0=:z18cBm0SYQpHGXssyom4tO swt4qeoyzXhHHEql04Ot/hitljV7ua3Dnh0Il1SxcFWweBslfpSJsRFIKmp9RP79XZt1R/v8u uXtXfrnaley+EilGhxfr0+20xcnlfvX89usTkgXqkvE6JrS46ISJa6smqNzfOp/GeshDg090K F2Onfd+Ejn2QjjUqkcAUEQ0t5BTU3xtWeOQtCHZ8cmRWDTyDpExWv6T3vncLPi4dm0D/a9ljh ApnPqd7FqijsbgEX071lr49mo9tzST5JImNlNMUo/HkLMV/dDFFh18wlkF94M+W7Af8EHVOws rkZjKPjarZpawDkjUOL5Xhwp2bx71a0lmawOfUODhkZaYmijV6nF06FD83py7U6vCBeS3YXUo 4YPkviSGWY0AvIKzp0GSKcL8Mr+SBwIRM2/TABVBvau6QTerugPMiQ9PQC5bfIz7TC9njIm1R o3dP2TZNhc9IV6j8uNslR+Lczxm4Ro8Z2mzVV1ry2sLyGJ1vDDQR7i1HpFBmUX+D6wtizEQ09 D4i79IEt+LxoBtUXHyUGZcIEzpcq56Aqkaz92gNNMdm28qYuVGY1Rj407xEbloz9vxnwABHit ZbEyMF98pAw1GNqvXXG5Gdcs+7b7gEXRPKTa1vANHanlXfejustfEyAm8rP2f23mCTHidCSkv 7T/JPgw5B6rOUcv+7FScZntEdEXcXSrm0Ji7e8R1rMsmuZw== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday, June 21, 2016 11:18:39 AM CEST Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got conflicts in: > > arch/arm64/boot/dts/broadcom/ns2-svk.dts > arch/arm64/boot/dts/broadcom/ns2.dtsi > > between commits: > > 97b1504a30b3 ("arm64: dts: enable pinctrl for Broadcom NS2 SoC") > 5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support") > > from the arm-soc tree and commit: > > 5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node") > > from the net-next 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. Looks good to me, thanks! I don't see a good way to resolve the conflict before the merge window, but it's simple enough that we can just send it this way and let Linus handle it. Arnd