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:06:29 -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 17:40:21 -0800 Andrew Morton wrote: > On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin <guro@...com> wrote: > > On Tue, Dec 15, 2020 at 07:21:56AM +1100, Stephen Rothwell wrote: > > > On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote: > > > > Today's linux-next merge of the akpm-current tree got conflicts in: > > > > > > > > include/linux/memcontrol.h > > > > mm/memcontrol.c > > > > > > > > between commit: > > > > > > > > bcfe06bf2622 ("mm: memcontrol: Use helpers to read page's memcg data") > > > > > > > > from the bpf-next tree and commits: > > > > > > > > 6771a349b8c3 ("mm/memcg: remove incorrect comment") > > > > c3970fcb1f21 ("mm: move lruvec stats update functions to vmstat.h") > > > > > > > > from the akpm-current tree. > > > > > > ... > > > > > > Just a reminder that this conflict still exists. Commit bcfe06bf2622 > > > is now in the net-next tree. > > > > Thanks, Stephen! > > > > I wonder if it's better to update these 2 commits in the mm tree to avoid > > conflicts? > > > > Basically split your fix into two and merge it into mm commits. > > The last chunk in the patch should be merged into "mm/memcg: remove incorrect comment". > > And the rest into "mm: move lruvec stats update functions to vmstat.h". > > > > Andrew, what do you think? > > I have "mm/memcg: remove incorrect comment" and "mm: move lruvec stats > update functions to vmstat.h" staged against Linus's tree and plan to > send them to him later today. So I trust the BPF tree maintainers will > be able to resolve these minor things when those patches turn up in > mainline. 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. AFAIU all we can do is tell Linus about the merge issue, and point at Stephen's resolution.
Powered by blists - more mailing lists