Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree

2017-11-02 Thread Shawn Guo
On Wed, Nov 01, 2017 at 01:47:04PM +0100, Cyrille Pitchen wrote: > >> 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 th

Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree

2017-11-01 Thread Cyrille Pitchen
+ linux-mtd Le 31/10/2017 à 03:16, Shawn Guo a écrit : > 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-no

RE: linux-next: manual merge of the spi-nor tree with the imx-mxs tree

2017-10-30 Thread Z.q. Hou
ailing List > ; Linux Kernel Mailing List > ; Marek Vasut > Subject: Re: linux-next: manual merge of the spi-nor tree with the imx-mxs > tree > > Hi all, > > + Marek > > Mark, thanks for this report. > > Shawn, Yuan, if I don't make a mistake, patch "d

Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree

2017-10-30 Thread Shawn Guo
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

Re: linux-next: manual merge of the spi-nor tree with the imx-mxs tree

2017-10-30 Thread Cyrille Pitchen
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 t