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=-3.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 1B88EC5519F for ; Fri, 13 Nov 2020 03:40:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 40B4022201 for ; Fri, 13 Nov 2020 03:40:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="1G3pp05s" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40B4022201 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 967BF6B005D; Thu, 12 Nov 2020 22:40:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F0D46B006C; Thu, 12 Nov 2020 22:40:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 790F26B006E; Thu, 12 Nov 2020 22:40:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0177.hostedemail.com [216.40.44.177]) by kanga.kvack.org (Postfix) with ESMTP id 49A3E6B005D for ; Thu, 12 Nov 2020 22:40:51 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id C5F38181AC9C6 for ; Fri, 13 Nov 2020 03:40:50 +0000 (UTC) X-FDA: 77477993460.05.sheet94_0f070342730b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id A9B0918017FCA for ; Fri, 13 Nov 2020 03:40:50 +0000 (UTC) X-HE-Tag: sheet94_0f070342730b X-Filterd-Recvd-Size: 4388 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 03:40:49 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 194D72078B; Fri, 13 Nov 2020 03:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605238848; bh=/q8MKf5SUSmEscF0eZXOpjRuAZkZq0xMRzTNU+z4n6k=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=1G3pp05sLp9HG2i4Mv+Cq+/vLErXAJ+/53NTakg98BU6a4bbfhyPCzVUcIE1tAq3a qe/N+teZxyabJR7y3e/QUP240+0hXRtai0r1B0d21NtPreWx18e9IiRqt0wZx4/tIW gU/zxxshWJJZnOR6HejKcGPBhoUXT4mADp+8jsQ0= Date: Thu, 12 Nov 2020 19:40:47 -0800 From: Andrew Morton To: Alexei Starovoitov Cc: Roman Gushchin , Stephen Rothwell , bpf , Alexei Starovoitov , Daniel Borkmann , Network Development , Andrii Nakryiko , Shakeel Butt , linux-mm , LKML , Kernel Team , Johannes Weiner , Michal Hocko Subject: Re: [PATCH bpf-next v5 01/34] mm: memcontrol: use helpers to read page's memcg data Message-Id: <20201112194047.ea7c95e2876931fc57ae1cee@linux-foundation.org> In-Reply-To: References: <20201112221543.3621014-1-guro@fb.com> <20201112221543.3621014-2-guro@fb.com> <20201113095632.489e66e2@canb.auug.org.au> <20201113002610.GB2934489@carbon.dhcp.thefacebook.com> <20201113030456.drdswcndp65zmt2u@ast-mbp> <20201112191825.1a7c3e0d50cc5e375a4e887c@linux-foundation.org> 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, 12 Nov 2020 19:25:48 -0800 Alexei Starovoitov wrote: > On Thu, Nov 12, 2020 at 7:18 PM Andrew Morton wrote: > > > > On Thu, 12 Nov 2020 19:04:56 -0800 Alexei Starovoitov wrote: > > > > > On Thu, Nov 12, 2020 at 04:26:10PM -0800, Roman Gushchin wrote: > > > > > > > > These patches are not intended to be merged through the bpf tree. > > > > They are included into the patchset to make bpf selftests pass and for > > > > informational purposes. > > > > It's written in the cover letter. > > > ... > > > > Maybe I had to just list their titles in the cover letter. Idk what's > > > > the best option for such cross-subsystem dependencies. > > > > > > We had several situations in the past releases where dependent patches > > > were merged into multiple trees. For that to happen cleanly from git pov > > > one of the maintainers need to create a stable branch/tag and let other > > > maintainers pull that branch into different trees. This way the sha-s > > > stay the same and no conflicts arise during the merge window. > > > In this case sounds like the first 4 patches are in mm tree already. > > > Is there a branch/tag I can pull to get the first 4 into bpf-next? > > > > Not really, at present. This is largely by design, although it does cause > > this problem once or twice a year. > > > > These four patches: > > > > mm-memcontrol-use-helpers-to-read-pages-memcg-data.patch > > mm-memcontrol-slab-use-helpers-to-access-slab-pages-memcg_data.patch > > mm-introduce-page-memcg-flags.patch > > mm-convert-page-kmemcg-type-to-a-page-memcg-flag.patch > > > > are sufficiently reviewed - please pull them into the bpf tree when > > convenient. Once they hit linux-next, I'll drop the -mm copies and the > > bpf tree maintainers will then be responsible for whether & when they > > get upstream. > > That's certainly an option if they don't depend on other patches in the mm tree. > Roman probably knows best ? That should be OK. They apply and compile ;)