On Wed, 13 Feb 2019 08:50:28 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > > It's definitely going to conflict with the proposed patch > > > over drivers/of/of_reserved_mem.c > > > > > > Rob, what's the next step then? > > > > Rebase it on top of what's in linux-next and apply it to the tree > > which has the above dependency. I'm guessing that is Andrew Morton's > > tree. > > Yeah, that is in Andrew's "post linux-next" patch series, so if you > rebase it on top of linux-next and then send it to Andrew with some > explanation. > > ... > > Actually, if it is intended for the stable trees, then presumably it is > intended to go to Linus for the current release? In which case, the > patch in Andrew's tree will have to be changed to cope after your patch > appears in Linus' tree (and therefore, linux-next). Yup, just do whatever needs to be done and I'll figure it out ;)
