On Mon, Jun 8, 2020 at 12:09 PM Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > > On Mon, Jun 8, 2020 at 8:35 AM Vasily Gorbik <gor@xxxxxxxxxxxxx> wrote: > > > > Please note 2 minor merge conflict resolutions below: > > There was a third because of the iommu tree I merged today. Oh, and please don't post the whole patch in your pull request. That's ok for small "fixes" pulls, but it's absolutely the wrong thing to do with thousands of lines, nobody is going to review that anyway when the review is supposed to happen on the individual patches. I'm surprised it even made it to lkml at almost 200k in size. Linus