On Mon, Apr 26, 2021 at 11:18:49AM -0700, Linus Torvalds wrote: > On Mon, Apr 26, 2021 at 8:11 AM Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > > Yeah, merge issues with other trees are hard to resolve in the single > > tree here, not much I can just yet, have to wait for them to hit Linus's > > tree. > > It's generally a good idea to mention these things if you know about > them, just in case the other tree had come in in the meantime and I > had merged it first. > > That didn't happen this time, and I do generally catch these things > anyway as long as they at least trigger problems for my usual x86-64 > allmodconfig builds (but not everything does trigger that). Sorry, will mention it next time when I know it's going to happen with another tree like this. Thanks for pulling, greg k-h
