From: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
To: Mark Brown <broonie@kernel.org>, Yuan Yao <yao.yuan@nxp.com>,
Hou Zhiqiang <Zhiqiang.Hou@nxp.com>,
Rob Herring <robh@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
Philipp Puschmann <pp@emlix.com>
Cc: linux-arm-kernel@lists.infradead.org,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Marek Vasut <marek.vasut@gmail.com>
Subject: Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree
Date: Tue, 31 Oct 2017 01:42:30 +0100 [thread overview]
Message-ID: <d38cf683-c7a8-51b1-896a-ff1fda0f64f9@wedev4u.fr> (raw)
In-Reply-To: <20171030181551.skcvt4mr4br7rtn2@sirena.co.uk>
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.
So Shawn, could you please remove this patch from your tree ?
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
>
next prev parent reply other threads:[~2017-10-31 0:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 18:15 linux-next: manual merge of the spi-nor tree with the imx-mxs tree Mark Brown
2017-10-31 0:42 ` Cyrille Pitchen [this message]
2017-10-31 2:16 ` Shawn Guo
2017-11-01 12:47 ` Cyrille Pitchen
2017-11-02 8:38 ` Shawn Guo
2017-10-31 2:39 ` Z.q. Hou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d38cf683-c7a8-51b1-896a-ff1fda0f64f9@wedev4u.fr \
--to=cyrille.pitchen@wedev4u.fr \
--cc=Zhiqiang.Hou@nxp.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=pp@emlix.com \
--cc=robh@kernel.org \
--cc=shawnguo@kernel.org \
--cc=yao.yuan@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).