From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 488E6C4361B for ; Tue, 15 Dec 2020 02:12:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E30D206CB for ; Tue, 15 Dec 2020 02:12:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726305AbgLOCMQ (ORCPT ); Mon, 14 Dec 2020 21:12:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:39816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbgLOCMD (ORCPT ); Mon, 14 Dec 2020 21:12:03 -0500 Date: Mon, 14 Dec 2020 18:11:21 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1607998282; bh=sUqh3HJspkh38MQUd1DY8IURRRC76cwrQvmEUaq2N7c=; h=From:To:Cc:Subject:In-Reply-To:References:From; b=IZ/B9tn86tQKrv8BX1UeuZT3LI3W4njC6rgJJd0lIw8ZK6sSx79q/BOr5LcaYRCjC aNyt+o81PKUWLuhkn2oIB7Q4Np7sjq3RjSgyLSZxaDt/hC+Z16LbqPx7f1iQj8m0ac LA6bN96Zg+4zXimEteUOcuVyUe8T0Pi4a3bKOnrc= From: Andrew Morton To: Jakub Kicinski Cc: Roman Gushchin , Stephen Rothwell , David Miller , Daniel Borkmann , Alexei Starovoitov , Networking , Alex Shi , Linux Kernel Mailing List , Linux Next Mailing List , Shakeel Butt Subject: Re: linux-next: manual merge of the akpm-current tree with the bpf-next tree Message-Id: <20201214181121.afe9628c62c4b5de1f5fee94@linux-foundation.org> In-Reply-To: <20201214180629.4fee48ae@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> References: <20201204202005.3fb1304f@canb.auug.org.au> <20201215072156.1988fabe@canb.auug.org.au> <20201215012943.GA3079589@carbon.DHCP.thefacebook.com> <20201214174021.2dfc2fbd99ca3e72b3e4eb02@linux-foundation.org> <20201214180629.4fee48ae@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote: > On Mon, 14 Dec 2020 17:40:21 -0800 Andrew Morton wrote: > > On Mon, 14 Dec 2020 17:29:43 -0800 Roman Gushchin 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 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. Linus tends not to like it when tree maintainers do last-minute conflict fixes. > 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.