Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp2283769rdh; Tue, 26 Sep 2023 19:56:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFnpZqG5mp1ShQ8vJ4iRzIYqkQAaLMvPlCLTkh+rNPfKD4HxKYP4Hb89qYgni3DbOzxMTfY X-Received: by 2002:a05:6a20:729b:b0:11f:4707:7365 with SMTP id o27-20020a056a20729b00b0011f47077365mr719675pzk.38.1695783404854; Tue, 26 Sep 2023 19:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695783404; cv=none; d=google.com; s=arc-20160816; b=uhpkq+BIZlLTtPZsX8YT/GeroiJD0ZBMRKtc+eNmy9ZEzZqGayDDhNu+ochgXoWGF6 Wxp9Pg2VdBOUgUvkQd495Wrw95oW59BhIC+1RLa526oKDp40GyyirCemwEVPO5Fdys+T tC1WEl+ngLGIiIwcblA07rU8OSGeM8vpvjcxi8HLom6PGI6fqZrL5+MgLngD3xKLI8Dx Xo/AURt9w2HOkwtB+ntoEf489HkB8ozenctQAaOUCUWYW/lFLtGCyhLC65apkB3RULwi jigz66HhGcVSCXrX11n/ztLbiYUuxgi7gQbXTWu09r7/9dycIDkLHF8Lgx5R7fSX3cGG qsfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=orjyqxzMipv8kwfgovdAwTG4JPXHD7W6TbqcYQTsunQ=; fh=k2JFa2RFlBUac4HHIkx/HUyuUv1wJzmI2EJ6T3M7cdQ=; b=OHGi5+x+GcPljO7mz5wi6t60fRiImVgNodw5yVxHrYzTLzM9gukmE278aoaw8vUcic EzKA1dMARkTVf2xcxojGSfA6ibD1GGgqI5vdw78+8sDboBWq6l3fFXyL0ifpncTPmCSX fpivHjzTb5ywYMJy6/Sa6WXnR5X0ZxpTGMNpM6ZRoRRhG1Int+rtX3e5jANuMBtyaHkK DTW7OniKloPtsBJ01mw0zeu2YYOmKgDnFh6XiZEO8Ba9hWXE+PYs4FY5SabLWuw1GuPw 5vUVA6T4hsuP0r+dZgQP8/SUbR94ZurwJUNozcQTtqeP1Qgnai7LfzJuxYZAkBe3Ut4I RfCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=YmPUSOYP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id nv9-20020a17090b1b4900b0026b365096e5si18023582pjb.53.2023.09.26.19.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 19:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=YmPUSOYP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 1F6C480309B8; Tue, 26 Sep 2023 19:30:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229530AbjI0Caf (ORCPT + 99 others); Tue, 26 Sep 2023 22:30:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236167AbjI0C0L (ORCPT ); Tue, 26 Sep 2023 22:26:11 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 108727D86; Tue, 26 Sep 2023 18:53:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695779612; bh=orjyqxzMipv8kwfgovdAwTG4JPXHD7W6TbqcYQTsunQ=; h=Date:From:To:Cc:Subject:From; b=YmPUSOYP3wgoXi5881h1dSMMzw+mHK3pAe/w/6MdGday1aVfCw19wv40buXfofOYx 9+vy1PGCLn/okHy9ddfvNBxpuLG26KaPpwGuIoqASFXHzE4e/zLn8+t8ky3lNyei8j dchzhM9JdqAMr4V65MexQCaNru8MSUwgEEB73EG1CTISgF6XG2tJwbhoFmoIMot3Ye Yw+I5tSBq7D5dzl23TYD4oF2d1+uxcR7JWraaan3JDd8faH+NalrZy1qjqsROWuKNY bJNIwAo9VMZdZDZw9WKsnvzQy1PYfpFyIdsGSpdMqgzquTQhMpjTqurVKk8kkFsl3a QVXdRDfJidujw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RwKQM6TZrz4x3k; Wed, 27 Sep 2023 11:53:31 +1000 (AEST) Date: Wed, 27 Sep 2023 11:53:30 +1000 From: Stephen Rothwell To: "Paul E. McKenney" , Steven Rostedt , Masami Hiramatsu Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: duplicate patches in the rcu tree Message-ID: <20230927115330.69ef6671@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/TebrxWbqq3O=RqDJD=p.u4X"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 26 Sep 2023 19:30:48 -0700 (PDT) --Sig_/TebrxWbqq3O=RqDJD=p.u4X Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, The following commits are also in the ftrace tree as different commits (but similar patches): 8f2612479c71 ("doc: Add /proc/bootconfig to proc.rst") 648c895fda8d ("doc: Update /proc/cmdline documentation to include boot co= nfig") These are commits 5f4028880652 ("doc: Add /proc/bootconfig to proc.rst") 6eab72b5fea3 ("doc: Update /proc/cmdline documentation to include boot co= nfig") in the ftrace tree. They are causing a conflict due to the differences. I am guessing that the commits in the ftrace tree are an older verison? --=20 Cheers, Stephen Rothwell --Sig_/TebrxWbqq3O=RqDJD=p.u4X Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUTixoACgkQAVBC80lX 0Gw0tgf/QyFlutIlCRtEOD85fbgt2dltTBki5a0F8TBEOxFBfcq/IexM0nXc+0d/ Mxjmaai0xc/bzgWle/LQS492ZVVcss25fV25zpbZyZLKB61zpS9UXEnVRHicqzor lkbZRgVXmPbz38C4IEfQS8qcuve/YnSMQh2yJeQ+qe967F7Tss06Ga9QvYCA8Pxp ehrjJ66ePtvySKF+38Me8gulCgVAs/Nm9UyRyyLjJIc6j0s2UjyfTgXhZpneY4k3 PIe0iP1eTbnNVScdUuJuFHtgC6QUQfrqcIMOqeQxJ0HgPoUGGBhv5nYvhnpe+C4t Iz5fmthjovrYjXmWG7+5FLm4BonbeQ== =lOu+ -----END PGP SIGNATURE----- --Sig_/TebrxWbqq3O=RqDJD=p.u4X--