On May 22, 2019 9:48:33 AM GMT+02:00, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >Hi Greg, > >On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman ><gregkh@xxxxxxxxxxxxxxxxxxx> wrote: >> >> Sorry, you are going to get a number of these types of minor >conflicts >> now. That's the problem of touching thousands of files :( > >Yeah, I expected that one I saw the commits. At least is is just after >-rc1, hopefully most maintainers will start their -next branches after >today :-) I can just rebase if that helps you out. Christian
