On Mon, Dec 09, 2019 at 10:48:20AM -0800, Linus Torvalds wrote: > How many conflicts will this result in generally? I like it, but I'd > like to have some idea of whether it ends up being one of those > "really painful churn" things? > > A couple of conflicts isn't an issue - they'll be trivial to fix. It's > the "this causes fifty silly conflicts" that I worry about, partly > because it then makes submaintainers inevitably do the wrong thing (ie > "I foresee an excessive amount of 'git rebase' rants next release"). I had about a dozend and a half conflicts rebasing this weekend, the previous version was approx -rc6 IIRC.
