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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EC4BCDB47E for ; Wed, 18 Oct 2023 15:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345169AbjJRPKr (ORCPT ); Wed, 18 Oct 2023 11:10:47 -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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)