| Message ID | 20231218142537.3b74c770@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-2967-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1005378dyi;
Sun, 17 Dec 2023 19:26:04 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IEKScv1iYdu4zxRkYElH4ks1aChwHjjHy/QLiaqntnh4cD19/r9ZzsOPbRrm0zAAYFN8O+K
X-Received: by 2002:a05:622a:244:b0:425:78fc:4471 with SMTP id
c4-20020a05622a024400b0042578fc4471mr21247632qtx.133.1702869964006;
Sun, 17 Dec 2023 19:26:04 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702869963; cv=none;
d=google.com; s=arc-20160816;
b=BePkL5e3okgq6fkiSg2SNl0tjilqO1KaWjOQS4KVEd217NzWJHdfZcm2qUDu4Cm7+f
0zdsQ2/MAr+oxPzS4NfeHF3tvODPqHt0v2SQ3j6HQC5yTKrqtubh95PfDPvmz7cXtK2d
D6pX6ioS+9gUKhbUnnLJLIchFEJfhvRriwXQEUyFgw0iJUvKdca1JOigSUiK0e5UYyjs
N98XhSKWt/5I39oUyRyO4VIsMaDS55ko3jUBenuRahY+YNVe3pOV1z6g/7cDXPVlUl0l
51zqWJfeOiEQqq3PPi6ApRH9+D64GJLayGcsH/Lg4kzhxQO0trgIw5zZk8Q9eqGFvAXJ
cmbg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence
:message-id:subject:cc:to:from:date:dkim-signature;
bh=p1ZUN9yydH+yIhaR4/KLunbUiJVXbsKuyzg7+saLzXI=;
fh=QbtzqSTwUi9yrVDTHCwHFymBw6TmJVppXfwiSbuPVCE=;
b=BXx0AT87KJ78pzFHKVwVCPanr+PMDPdlsUFgne1B95sxc0kz1cENrX2rnQ+dSFfKF9
j83HMpAgBBF0Aj4iEg/UcYWYaQxPOL8CQGsmcvLAFLNdtPa2WtExSanPvwHqVmazvu7U
L16h2nsy979xgU7RTDhv0F7INsf+h7Ha13M7poZsy6hhcYAATLE71jg6klWS60/ALYLM
Mt3601yECR7Ki7GW1RJalHSETyrNymvTzrpLjdZRS5BKRMz1xv1p+PCmn6gDB9h5QuOp
PMW98c9nziIz4nDRYd8LDdb1/+d2VS4xH4xsO1xI4VyFLuEGOFPOiLVzWO6ansks7pRm
Z8aw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=aPL2BAlU;
spf=pass (google.com: domain of
linux-kernel+bounces-2967-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-2967-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org.
[2604:1380:45d1:ec00::1])
by mx.google.com with ESMTPS id
ay13-20020a05622a228d00b00423aca6388bsi23757818qtb.786.2023.12.17.19.26.03
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 17 Dec 2023 19:26:03 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-2967-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=aPL2BAlU;
spf=pass (google.com: domain of
linux-kernel+bounces-2967-ouuuleilei=gmail.com@vger.kernel.org designates
2604:1380:45d1:ec00::1 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-2967-ouuuleilei=gmail.com@vger.kernel.org";
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au
Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org
[52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by ny.mirrors.kernel.org (Postfix) with ESMTPS id A15E51C20BB2
for <ouuuleilei@gmail.com>; Mon, 18 Dec 2023 03:26:03 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 6925E63DE;
Mon, 18 Dec 2023 03:25:48 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b="aPL2BAlU"
X-Original-To: linux-kernel@vger.kernel.org
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9990063A3;
Mon, 18 Dec 2023 03:25:40 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=canb.auug.org.au
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
s=201702; t=1702869938;
bh=p1ZUN9yydH+yIhaR4/KLunbUiJVXbsKuyzg7+saLzXI=;
h=Date:From:To:Cc:Subject:From;
b=aPL2BAlUkMKm/b6Q3dc9R4366ZfBE0jj06r1cKS+Y3YY32/RqYSX46yw0vm+a9siK
9L695vqaBDvWUYlYeh5vT279Y8hnmdn7XM8syXqM5il8EFb9qcO5VYGPW8IAPbqYmN
dJECTRKVeeqrRW8MLawwuZeQp3Y4/bHUAoPO9Z61DS+xqY/RDmqgOg+FNuRsm63X0q
aOwDpcgBbI2hoN/t2H0WXwhC4Sw/hc7MyAUHxB3w8QdFRzE3nad1O75+y6bYUnYhYD
yfyP08kB+3hRkSXliSXhYnMpxdIE2hcoxppLKADXXG/y4+iYgk/W+HJ+YS2hGscryv
jeutvPcxoyZ+g==
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 X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by mail.ozlabs.org (Postfix) with ESMTPSA id 4StlZn5VzMz4xPh;
Mon, 18 Dec 2023 14:25:37 +1100 (AEDT)
Date: Mon, 18 Dec 2023 14:25:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>, Jonathan Corbet
<corbet@lwn.net>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
Mailing List <linux-next@vger.kernel.org>, Vlastimil Babka <vbabka@suse.cz>
Subject: linux-next: manual merge of the rcu tree with the jc_docs tree
Message-ID: <20231218142537.3b74c770@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=tx.bSTmqmFJghJvb9Kx2Al";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785588575453442823
X-GMAIL-MSGID: 1785588575453442823
|
| Series |
linux-next: manual merge of the rcu tree with the jc_docs tree
|
|
Commit Message
Stephen Rothwell
Dec. 18, 2023, 3:25 a.m. UTC
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
Documentation/admin-guide/kernel-parameters.txt
between commit:
a3a27827452f ("Documentation, mm/unaccepted: document accept_memory kernel parameter")
from the jc_docs tree and commit:
801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters")
from the rcu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
Comments
On 12/18/23 04:25, Stephen Rothwell wrote: > Hi all, Hi, > Today's linux-next merge of the rcu tree got a conflict in: > > Documentation/admin-guide/kernel-parameters.txt > > between commit: > > a3a27827452f ("Documentation, mm/unaccepted: document accept_memory kernel parameter") > > from the jc_docs tree and commit: > > 801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters") in light of that commit, the accept_memory should now have: + accept_memory= [MM,EARLY] Jon, can you update it still, or want a followup patch, or perhaps will suggest Linus to do that as part of the merge? > > from the rcu tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. >
diff --cc Documentation/admin-guide/kernel-parameters.txt index 33859d298907,b8f131977682..000000000000 --- a/Documentation/admin-guide/kernel-parameters.txt