Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3866005rdg; Wed, 18 Oct 2023 08:11:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFHclSY6iBMhUUvHySD0b8+g6h49Mbqg67cIGv5ZZsQX8wngHgdY9tvymg/+SGacBloAho X-Received: by 2002:a05:6358:514e:b0:13a:4f34:8063 with SMTP id 14-20020a056358514e00b0013a4f348063mr5130565rwj.32.1697641895076; Wed, 18 Oct 2023 08:11:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697641895; cv=none; d=google.com; s=arc-20160816; b=aKkbhpV8wT2AYnoihLEG0ra55ItG5CxqxLr2gfXc35CbhCdFDgqog4BbLZme/XlJ1H 7Csa/Nhba2icNLDafCxZWPBxx6SKG0DuEcsTkV7LmzZipCAGTOg+ztS/6m7KjSy4tUjI 4OyMeTqJxcwHR4ERAlxn7wT7qpPEaty0q2t3CBtOzJC7+X7PmzE+OBK8fAececBfvQqq jqgFwywhYAgG88BL8pYknB01AFw92vH1FnssvNiHFXRAlAjKy71WbdPfT3aKMmP3FZ9w Zipbz7UWKqKvCG7IkMQqYy4XHAVq9N+OgbFM5vhdAAM/2ZqnFabmYE7Gr0oF4R7yPwEf hg1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=thHemJs72KfbpKTdOhtLv0e4arPQhthnhba6ud6sY7E=; fh=1eJszPkEr3L42zQbwyf0rvu1fOQ1HlllMu+PDyk2CJw=; b=c1nLc0iT2ZOhSDMNyT2TGRRW6CLKSGxHEk7HuSmGUQXGoKXj3kZb/IaBMmeTmgS2S+ o1C6UkQcuK06+4RTsGuzZMgyPZCGx/huFn66B3wNPMxQWY7DM2McFdgKWanWWQRRgAj+ MmFMYhBMqhb9kDrIILp9JUTu16Pjx0ueNsP5d/wd1cyAioS3OugA3ywpRvuONryueZxZ /LeAFJJ6TeLxQfk+33Nz1whZW08kfa7T0VRL8joLNzPuOyLUCZuVKpXcb4wFxk5/C6C5 /vJbKcXDpWH+dpGaHLrDYM+CqFgb6U/8ssnYEU6Ns9JNOIyMxZ1fOAzfZtmJOdTGCuJr lI7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GYhfV+NV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g3-20020a6544c3000000b005657ba564bdsi2257266pgs.826.2023.10.18.08.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 08:11:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GYhfV+NV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 66F5B80615C0; Wed, 18 Oct 2023 08:10:49 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345151AbjJRPKq (ORCPT + 99 others); Wed, 18 Oct 2023 11:10:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230228AbjJRPKp (ORCPT ); Wed, 18 Oct 2023 11:10:45 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFB90BA; Wed, 18 Oct 2023 08:10:43 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91EE5C433C7; Wed, 18 Oct 2023 15:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697641843; bh=1taXjK2kFBaDz/Sl8rKQr3Q5UTLj/igjlkRDVwn3IZA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=GYhfV+NVUz+rf2hYAyKDaJLX57LmBn2TRwbXTL4fW1XL3L0eceK7S07+xSj3l9wku wKeGhIkzBfXZYmem0CV7AlyLD8ndqQJAgQ4FEycXKhJoatSlT+az1iLfE9v3sSsYPR GTLf9UG+cMmRN8DmOdxVr4k0m0y/8S/yb7asmnsSKqbQbGdHB8XQ1zv4kjK7bWPza5 DJO+3QoEYlWR2knHJBjBJiaIRlEje41eb/kIcvn5j/wsHMw83u1RRxlKylNIXfuaQh jbYnzpZ28WM4h1hMyEIc52tDqWo4QYMTsGf8RTKAlpEJAKep0F+mYZusHd+hiVedaV gUK7n5vI1AcNw== Date: Thu, 19 Oct 2023 00:10:38 +0900 From: Masami Hiramatsu (Google) To: Stephen Rothwell Cc: Steven Rostedt , Andrew Morton , "Paul E. McKenney" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the ftrace tree Message-Id: <20231019001038.ed0fa7568e95d2409eb6a697@kernel.org> In-Reply-To: <20231018141857.6ba1f328@canb.auug.org.au> References: <20231018141857.6ba1f328@canb.auug.org.au> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 18 Oct 2023 08:10:49 -0700 (PDT) On Wed, 18 Oct 2023 14:18:57 +1100 Stephen Rothwell wrote: > Hi all, > > The following commits are also in the mm tree as a different commit > (but the same patch): > > 2db949178eca ("fs/proc: Add boot loader arguments as comment to /proc/bootconfig") > > This is commit > > d120336bf502 ("fs/proc: add boot loader arguments as comment to /proc/bootconfig") Hmm, sorry, I picked this patch on my bootconfig/for-next branch because it depends on the bootconfig feature. Thank you, > > in the mm tree. > > -- > Cheers, > Stephen Rothwell -- Masami Hiramatsu (Google)