On Mon, 14 Dec 2020 18:11:21 -0800 Andrew Morton wrote: > On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski <kuba@xxxxxxxxxx> wrote: > > Hm. The code is in net-next by now. I was thinking of sending the > > Networking PR later today (tonight?) as well. I'm happy to hold off > > or do whatever you require, but I'd appreciate more explicit / noob > > friendly instructions. > > Linus tends not to like it when tree maintainers do last-minute > conflict fixes. Good to know. > > AFAIU all we can do is tell Linus about the merge issue, and point > > at Stephen's resolution. > > That's the way to do it - including a (tested?) copy in the email would > be nice. Okay, great. Will try this, thanks!
