From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Theodore Ts'o <tytso@mit•edu>,
"Jason A. Donenfeld" <Jason@zx2c4•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Luis Chamberlain <mcgrof@kernel•org>,
Xiaoming Ni <nixiaoming@huawei•com>
Subject: linux-next: manual merge of the akpm tree with the random tree
Date: Mon, 17 Jan 2022 12:07:04 +1100 [thread overview]
Message-ID: <20220117120704.19968aab@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
drivers/char/random.c
between commit:
f90d704ab3cd ("random: de-duplicate INPUT_POOL constants")
from the random tree and patch:
"random: move the random sysctl declarations to its own file"
from the akpm-current 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/char/random.c
index 7e9caf092cd8,d7c034ea59bf..000000000000
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -2013,9 -2087,8 +2013,8 @@@ static int proc_do_entropy(struct ctl_t
return proc_dointvec(&fake_table, write, buffer, lenp, ppos);
}
-static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
+static int sysctl_poolsize = POOL_BITS;
- extern struct ctl_table random_table[];
- struct ctl_table random_table[] = {
+ static struct ctl_table random_table[] = {
{
.procname = "poolsize",
.data = &sysctl_poolsize,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-01-17 1:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 1:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-18 1:52 linux-next: manual merge of the akpm tree with the random tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220117120704.19968aab@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jason@zx2c4$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mcgrof@kernel$(echo .)org \
--cc=nixiaoming@huawei$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox