From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753560AbdJaCRY (ORCPT ); Mon, 30 Oct 2017 22:17:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:47336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753535AbdJaCRW (ORCPT ); Mon, 30 Oct 2017 22:17:22 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E133F21925 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=shawnguo@kernel.org Date: Tue, 31 Oct 2017 10:16:52 +0800 From: Shawn Guo To: Cyrille Pitchen , Arnd Bergmann Cc: Mark Brown , Yuan Yao , Hou Zhiqiang , Rob Herring , Philipp Puschmann , linux-arm-kernel@lists.infradead.org, Linux-Next Mailing List , Linux Kernel Mailing List , Marek Vasut Subject: Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree Message-ID: <20171031021650.GC6270@dragon> References: <20171030181551.skcvt4mr4br7rtn2@sirena.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Oct 31, 2017 at 01:42:30AM +0100, Cyrille Pitchen wrote: > Hi all, > > + Marek > > Mark, thanks for this report. > > Shawn, Yuan, if I don't make a mistake, patch "dt-bindings: mtd: add sst25wf040b > and en25s64 to sip-nor list" was not submitted to the linux-mtd mailing list > hence was neither reviewed nor acked by any spi-nor maintainer. If so, such a > patch should then be taken from the spi-nor/next branch of the l2-mtd tree. I see the patch was Acked by DT maintainer and so applied it as part of the series. I will leave such mtd bindings patch to l2-mtd maintainers in the future. > So Shawn, could you please remove this patch from your tree ? I have already sent the patch to my upstream maintainers (arm-soc). I guess it's okay to leave such trivial conflict to Linus. @Arnd, what do you think? Shawn > Yuan, could you please submit your patch to the linux-mtd mailing list for > proper review ? > > Best regards, > > Cyrille > > > Le 30/10/2017 à 19:15, Mark Brown a écrit : > > Hi Cyrille, > > > > Today's linux-next merge of the spi-nor tree got a conflict in: > > > > Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > > > > between commit: > > > > b07815d4eaf65 ("dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list") > > > > from the imx-mxs tree and commit: > > > > 282e45dc64d1 ("mtd: spi-nor: Add support for mr25h128") > > > > from the spi-nor 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 Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > > index 4cab5d85cf6f,956bb046e599..000000000000 > > --- a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > > +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt > > @@@ -13,7 -13,7 +13,8 @@@ Required properties > > at25df321a > > at25df641 > > at26df081a > > + en25s64 > > + mr25h128 > > mr25h256 > > mr25h10 > > mr25h40 > > >