On Wed 05-07-17 11:35:51, Linus Torvalds wrote: > On Wed, Jul 5, 2017 at 11:28 AM, Michal Hocko <mho...@kernel.org> wrote: > > > > Dohh, that was on mmotm which has a clean up by Oleg which reorganizes > > the code a bit. This is on top of the current master > > Oh, ok. I think I know which patch from Oleg you're talking about. > > Since I do want that patch too, and since I'd hate to cause > unnecessary merge conflicts in this area, how about we just plan on > letting your original patch (on top of Oleg's) go through Andrew and > the -mm tree? I'll get it that way, and it's not like this is > timing-critical.
That would lead to conflicts when backporting to stable trees though which is quite annoying as well and arguably slightly more annoying than resolving this in mmotm. I can help to rebase Oleg's patch on top of mine which is not a stable material. -- Michal Hocko SUSE Labs
