| Message ID | 20240226135745.12ac854d@canb.auug.org.au |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel+bounces-80434-ouuuleilei=gmail.com@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id
bq27csp1838953dyb;
Sun, 25 Feb 2024 18:58:04 -0800 (PST)
X-Forwarded-Encrypted: i=3;
AJvYcCV9ZSzrizwXiXxmcXlYjxzzc5x0gOgE9NenJ5gm9oxgrKP7VzpcSnk4bvvX2PDiOlVUv0SiQQ7+vaNQ4kTRZWAiCyD0Ng==
X-Google-Smtp-Source:
AGHT+IEWEfD/drK+SOO0OEcpVpxYgQ9bLornmzpUTib5TeTSx+G30zdalVyAhtgvptjXXvpXwvJP
X-Received: by 2002:a05:622a:4486:b0:42e:877f:a1db with SMTP id
kb6-20020a05622a448600b0042e877fa1dbmr885690qtb.2.1708916284484;
Sun, 25 Feb 2024 18:58:04 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1708916284; cv=pass;
d=google.com; s=arc-20160816;
b=Q7nQSrofh4c/iZRtXulZ8DO9HWqzvRZYR7EPjUIn7fz6x79wWdwpUuTeniVy2sT3h9
ElOeLK1SidIQoM9Y9OXo/rE+G/JGrly7NA56udkHPl31Ntjfks5gzJXSVJvpUM2I8vOZ
10Lw4xmg4STfY1JAPMNJJi99mXL4PZw3JlACX/sMoj2vDL6l/PVF4Iuz60tqPQ7VHHo3
AUviqAs9CTJoXWF9BQSbUgKPY7YKXbSEQ4M/ufq7e5oprnABcOfeCGoyVf1PHJ6S6dYF
0S64x/pjWPLuEetGrUrR5Uc/+0kJjD/rz4BZ5XcPj4VSXzBwsDPJGf1I1VD5g+9cGttn
AUOA==
ARC-Message-Signature: i=2; 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=MIBBx6GI1McT+ipBiqM/URogFUQRYQ2StmjJeyQkKFY=;
fh=5VKuiwt6c/oirJZ/lamMrfi7nEfN+arWKBm6mZ+13g0=;
b=enj8PlsSp448TT5QLwpxF9HdKfiw8llq1e6pC1N/b4AX6+uCzUrk1x4IgVR1Y67JCB
aq7S8ZcF8SDGGpGQYO2UFCLRcCKHhouBUn27NEIAKp7HBpYIfA0JkAWVRM71LyfU+sHI
52BkNqE5HOq3DoF6lOJQtLnO7MAaj/0eFkJC77D3XhxYNPOXl0JflMytRCc6sE8YaYJk
UlUANFMwQsrPJ+fRGF7GT1eJFQRAKAUF/qxhrRBHruCltxZD2+XKZ2ODwW6FFd1US7RS
ukpk3DDfUwhLnTiDScfOLRPyY5VMOcAsZxpO53cKXIYsTaC4D6Pmi/Tsp/X5KKniyDQu
lG2w==;
dara=google.com
ARC-Authentication-Results: i=2; mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=izpYQFOR;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-80434-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-80434-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. [147.75.199.223])
by mx.google.com with ESMTPS id
o5-20020ac872c5000000b0042e02b57160si4082477qtp.303.2024.02.25.18.58.04
for <ouuuleilei@gmail.com>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 25 Feb 2024 18:58:04 -0800 (PST)
Received-SPF: pass (google.com: domain of
linux-kernel+bounces-80434-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Authentication-Results: mx.google.com;
dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=izpYQFOR;
arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass
dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au);
spf=pass (google.com: domain of
linux-kernel+bounces-80434-ouuuleilei=gmail.com@vger.kernel.org designates
147.75.199.223 as permitted sender)
smtp.mailfrom="linux-kernel+bounces-80434-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 483791C21527
for <ouuuleilei@gmail.com>; Mon, 26 Feb 2024 02:58:04 +0000 (UTC)
Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
by smtp.subspace.kernel.org (Postfix) with ESMTP id 13A2C1B270;
Mon, 26 Feb 2024 02:57:53 +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="izpYQFOR"
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 0504E17BB9;
Mon, 26 Feb 2024 02:57:47 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=150.107.74.76
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1708916270; cv=none;
b=Ys+K/Jg//kN5lS/r2i3xRnrwomeif5kEg+iTjt5mcocqebf+Oq1+wXB30LOjlHTG8gvE9ZXTYMzFvak1dkWmkSySgtZZRfShFbaw0HpGgL7TjpDOEsDidfP4xWO7Yuqr3+a+DyYVF5yhOHKUjDLM2IhwPV8jNuAB/E++LEDke7M=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1708916270; c=relaxed/simple;
bh=sf0KuPewUZdF8qwi9t9dgOKKjG4aN33ww+ZjUC4PqeY=;
h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=nAeG55bi21dPts44COTL3hk6UGz86wvjQA/yVLUWmbuF5+BBMUiYGU8bmYvB5aZ/xrCbRT9wWiD+dmQQ+ETzBPiKquDln1+0evssuZxSaR6B44L8snjW1CZqi4tc15P5O0c6flpc75KEY+OS5sZSsccf8PLWuNZnYRUMvA9CnXc=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=canb.auug.org.au;
spf=pass smtp.mailfrom=canb.auug.org.au;
dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
header.b=izpYQFOR; arc=none smtp.client-ip=150.107.74.76
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=1708916266;
bh=MIBBx6GI1McT+ipBiqM/URogFUQRYQ2StmjJeyQkKFY=;
h=Date:From:To:Cc:Subject:From;
b=izpYQFOR/IbI+5PtE9V9CKOrVm6RblRIfkkXotuQjU/i2BmOVeprc1T+32SVa1wf2
Icb/zi4ezbwpAAz83Ox6yykn0ZPeQXO4Mmtv70RbVezkGCulxgs7W/qojwyZa2Qep6
35H3ws7KguLHWE74KhZ6bKWgo6vYUa2zPkgQAoBTJ4dyi9tei24d9ipP8IwIHClZNb
cLJHVv1Vsb+yCFu1zBoxxuqeJe+wWIQEVSRauXVDpexK7kyxRLgiWsU4pVjTS9JrH8
kbWhXVORO/jAV7TXRaDvtw6dZHmiknRu5zYmplhRr6h0KMYRTeSzrlI6x6eB2f1KvZ
yEbv8C5bwEtoA==
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 4TjlfK69tlz4wcC;
Mon, 26 Feb 2024 13:57:45 +1100 (AEDT)
Date: Mon, 26 Feb 2024 13:57:45 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>, "Rafael J. Wysocki"
<rjw@rjwysocki.net>
Cc: Boqun Feng <boqun.feng@gmail.com>, Linux Kernel Mailing List
<linux-kernel@vger.kernel.org>, Linux Next Mailing List
<linux-next@vger.kernel.org>, Nikhil V <quic_nprakash@quicinc.com>
Subject: linux-next: manual merge of the rcu tree with the pm tree
Message-ID: <20240226135745.12ac854d@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_/4gv1_Pr=DbHejtL+I7uOn.=";
protocol="application/pgp-signature"; micalg=pgp-sha256
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1791928602031234843
X-GMAIL-MSGID: 1791928602031234843
|
| Series |
linux-next: manual merge of the rcu tree with the pm tree
|
|
Commit Message
Stephen Rothwell
Feb. 26, 2024, 2:57 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:
3fec6e5961b7 ("PM: hibernate: Support to select compression algorithm")
from the pm tree and commit:
600716592a3a ("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
Hi Stephen, On Monday, February 26, 2024 3:57:45 AM CET Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > Documentation/admin-guide/kernel-parameters.txt > > between commit: > > 3fec6e5961b7 ("PM: hibernate: Support to select compression algorithm") > > from the pm tree and commit: > > 600716592a3a ("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. The conflict resolution looks good to me, thank you!
On Mon, Feb 26, 2024 at 01:57:45PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the rcu tree got a conflict in: > > Documentation/admin-guide/kernel-parameters.txt > > between commit: > > 3fec6e5961b7 ("PM: hibernate: Support to select compression algorithm") > > from the pm tree and commit: > > 600716592a3a ("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. > Thanks! The below looks good to me ;-) Regards, Boqun > -- > Cheers, > Stephen Rothwell > > diff --cc Documentation/admin-guide/kernel-parameters.txt > index c503770e8f0b,3f894fbb4916..000000000000 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@@ -1753,18 -1749,7 +1754,18 @@@ > (that will set all pages holding image data > during restoration read-only). > > + hibernate.compressor= [HIBERNATION] Compression algorithm to be > + used with hibernation. > + Format: { lzo | lz4 } > + Default: lzo > + > + lzo: Select LZO compression algorithm to > + compress/decompress hibernation image. > + > + lz4: Select LZ4 compression algorithm to > + compress/decompress hibernation image. > + > - highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact > + highmem=nn[KMG] [KNL,BOOT,EARLY] forces the highmem zone to have an exact > size of <nn>. This works even on boxes that have no > highmem otherwise. This also works to reduce highmem > size on bigger boxes.
diff --cc Documentation/admin-guide/kernel-parameters.txt index c503770e8f0b,3f894fbb4916..000000000000 --- a/Documentation/admin-guide/kernel-parameters.txt