lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 14 Dec 2020 18:13:39 -0800 From: Jakub Kicinski <kuba@...nel.org> To: Andrew Morton <akpm@...ux-foundation.org> Cc: Roman Gushchin <guro@...com>, Stephen Rothwell <sfr@...b.auug.org.au>, David Miller <davem@...emloft.net>, Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov <ast@...nel.org>, Networking <netdev@...r.kernel.org>, Alex Shi <alex.shi@...ux.alibaba.com>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List <linux-next@...r.kernel.org>, Shakeel Butt <shakeelb@...gle.com> Subject: Re: linux-next: manual merge of the akpm-current tree with the bpf-next tree On Mon, 14 Dec 2020 18:11:21 -0800 Andrew Morton wrote: > On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski <kuba@...nel.org> 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!
Powered by blists - more mailing lists