On Thu, Sep 19, 2019 at 8:48 PM Linus Torvalds <torva...@linux-foundation.org> wrote: > > No problem. I'm used to merges, and I appreciate the heads-up.
Heh. The Kbuild merge turns out to be painful for other trees too. I
suspect the module tree isn't going to be any worse than the
DEBUG_INFO_BTF conflict.
Linus
