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=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 F391BC433E2 for ; Tue, 26 May 2020 06:13:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C2B6220C56 for ; Tue, 26 May 2020 06:13:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2B6220C56 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 622A18007B; Tue, 26 May 2020 02:13:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D3CB80061; Tue, 26 May 2020 02:13:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C2A58007B; Tue, 26 May 2020 02:13:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id 30E6480061 for ; Tue, 26 May 2020 02:13:14 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id EBD1D4DA6 for ; Tue, 26 May 2020 06:13:13 +0000 (UTC) X-FDA: 76857852666.01.hour81_565bf1b18bd08 X-HE-Tag: hour81_565bf1b18bd08 X-Filterd-Recvd-Size: 2241 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Tue, 26 May 2020 06:13:13 +0000 (UTC) Received: by verein.lst.de (Postfix, from userid 2407) id BE22268BEB; Tue, 26 May 2020 08:13:09 +0200 (CEST) Date: Tue, 26 May 2020 08:13:09 +0200 From: Christoph Hellwig To: Andrew Morton Cc: Christoph Hellwig , x86@kernel.org, Alexei Starovoitov , Daniel Borkmann , Masami Hiramatsu , Linus Torvalds , linux-parisc@vger.kernel.org, linux-um@lists.infradead.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: clean up and streamline probe_kernel_* and friends v4 Message-ID: <20200526061309.GA15549@lst.de> References: <20200521152301.2587579-1-hch@lst.de> <20200525151912.34b20b978617e2893e484fa3@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200525151912.34b20b978617e2893e484fa3@linux-foundation.org> User-Agent: Mutt/1.5.17 (2007-11-01) 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 Mon, May 25, 2020 at 03:19:12PM -0700, Andrew Morton wrote: > hm. Applying linux-next to this series generates a lot of rejects against > powerpc: > > -rw-rw-r-- 1 akpm akpm 493 May 25 15:06 arch/powerpc/kernel/kgdb.c.rej > -rw-rw-r-- 1 akpm akpm 6461 May 25 15:06 arch/powerpc/kernel/trace/ftrace.c.rej > -rw-rw-r-- 1 akpm akpm 447 May 25 15:06 arch/powerpc/mm/fault.c.rej > -rw-rw-r-- 1 akpm akpm 623 May 25 15:06 arch/powerpc/perf/core-book3s.c.rej > -rw-rw-r-- 1 akpm akpm 1408 May 25 15:06 arch/riscv/kernel/patch.c.rej > > the arch/powerpc/kernel/trace/ftrace.c ones aren't very trivial. > > It's -rc7. Perhaps we should park all this until 5.8-rc1? As this is a pre-condition for the set_fs removal I'd really like to get the actual changes in. All these conflicts seem to be about the last three cleanup patches just doing renaming, so can we just skip those three for now? Then we can do the rename right after 5.8-rc1 when we have the least chances for conflicts.