Re: Dealing with complex patch series in linux-next

[Christian Brauner <christian.brauner@ubuntu.com>]

On Tue, Jan 26, 2021 at 07:00:30PM +1100, Stephen Rothwell wrote:
> Hi Christian,
> 
> On Mon, 25 Jan 2021 10:43:23 +0100 Christian Brauner <christian.brauner@ubuntu.com> wrote:
> >
> > After having received another round of acks on the idmapped mounts
> > series and other fses about to move forward with porting I moved forward
> > with merging [1] into my for-next branch which is tracked by sfr in
> > linux-next.
> > Given the nature of the series I expected there to be a good chunk of
> > merge conflicts including some non-trivial ones. But there proved to be
> > too many conflicts or at least a few ones that sfr couldn't handle
> > without more insight into the series. So after talking to sfr this
> > morning we decided to drop the tree for today.
> 
> OK, so tomorrow, I will try merging your tree really early.  This will,
> at least, spread the conflict pain out for me (yesterday it hit all at
> once at 4pm and added an hour to my day before I gave up).  Lets see
> how that goes.
> 
> Unless someone comes up with a better suggestion, of course :-)

I'm happy to help you if you want me to apply it to somewhere specific,
rebase or whatever. I have no problem doing it on a daily basis if that
makes it easier for you.

(Btw, I'm not sure this mail has made it to everyone here. It's
definitely not on lkml (as of now) seemingly because vger is having some
issues.)

Christian