Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3867872rdg; Wed, 18 Oct 2023 08:14:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGXLCNgKEu4SzXxHHt/ubpzfM6NmGAA+VFi5qdbCg59V55iVQrvbykjatg7Yb0vFGHm6PAd X-Received: by 2002:a05:6a00:2d0f:b0:6ba:8478:b99f with SMTP id fa15-20020a056a002d0f00b006ba8478b99fmr5778517pfb.28.1697642050311; Wed, 18 Oct 2023 08:14:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697642050; cv=none; d=google.com; s=arc-20160816; b=FfuJGoqHIzMn1iweiiGepwoOHB2iFV3wKWRmuBgKc5cOzbn4WywGhCqSjkFIgwhiwo 70MMGy95dBf967kcEQ5npGDF1DKrjp+Ikm3L6N8N/lA4JkbCgBYqTOOpX4+YGThUJB90 x3L7SZhvN9ra1aSKXlbSUf33me12f1JathQ69KU9AutqKHyJ38n4lmDfPuuc5ddXJgQB 2r05gJByD9DzqvgAGzxjVYcgKgg+WUkT9XEPr78n3gMgarJMz35z99EHlTT3TgjooDpO myS1O0G70IDvBNV60sPXsZRjGpYqxxKsqPdaxvblwjy8OX9wy3JW2fYGXBwgtcjrjA+0 Q8WQ== 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=cclIQ/MSdb6crUXKN/vrwlJVjg9Cu6A4+HYs3FMTPt8=; fh=hHx8XyyB2LeEUKapaqWJ7U4ntKKaQXjfzQDWZZ3k+TI=; b=x63JPFKoEadUT5k0cGGKlpC4mtTwXsr4AzQ1MQxpbCYfcicvMu0LdFXERtL5OlQpsH 7iFETpaxKQhOo/cR4l/W7vpVEIqJ0PiiKyg5MzOVoyyGlGKhmFydjNdpf1/bKNRa+lWw LaqHFwUHs6wtWlPQ6GQNOBdGqMyNURiXDOxaS18LGZjHGoK9LdZ3tM5B/z63FrtIZaa3 Dzu77UGy04AejRwUgVfOOfVLx9BGgqDTkZBmHAhBkRNb9WYxBBjSFpeWPMxz+++LONxU +7PX3e5cXTAu4w9rOq3TT7ZB1HyXLTJikl82SNS2TsDY4J/JEjZHxCJU7sSxpVJ71yAD 0qww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b="u/fgA1Ly"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id i191-20020a6387c8000000b005859b2d8d7asi2308453pge.4.2023.10.18.08.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 08:14:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b="u/fgA1Ly"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E41AD8022ABA; Wed, 18 Oct 2023 08:14:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235325AbjJRPOA (ORCPT + 99 others); Wed, 18 Oct 2023 11:14:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235063AbjJRPNw (ORCPT ); Wed, 18 Oct 2023 11:13:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E683EA; Wed, 18 Oct 2023 08:13:50 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA070C433C8; Wed, 18 Oct 2023 15:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1697642030; bh=Rn5ZY3cxY/j1OTIpp2TrL+TBhZ3o5KCwQERM+GGg6S0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=u/fgA1LyLVi7hRoLvKfisDGRlK5EtS/jM9+z2KdMuKUFjyMP1s4/OPEGUurjSwdmE m2EqxE1RG92VKuV098YJPXx5eShwXJgi9w+4cL8pyKoty3UTIYVE6Eg1Q6OkDYV+HB mz9lwHqlPO2MmbOiGe0lm3TNUDJuQ3BTLimIKsKE= Date: Wed, 18 Oct 2023 08:13:49 -0700 From: Andrew Morton To: Masami Hiramatsu (Google) Cc: Stephen Rothwell , Steven Rostedt , "Paul E. McKenney" , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patch in the ftrace tree Message-Id: <20231018081349.b5762f6f2c362fa8f84df5d2@linux-foundation.org> In-Reply-To: <20231019001038.ed0fa7568e95d2409eb6a697@kernel.org> References: <20231018141857.6ba1f328@canb.auug.org.au> <20231019001038.ed0fa7568e95d2409eb6a697@kernel.org> X-Mailer: Sylpheed 3.8.0beta1 (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=-4.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email 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 (howler.vger.email [0.0.0.0]); Wed, 18 Oct 2023 08:14:08 -0700 (PDT) On Thu, 19 Oct 2023 00:10:38 +0900 Masami Hiramatsu (Google) wrote: > 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. > I dropped the copy from mm.git.