linux-next: manual merge of the akpm tree with the random tree

[Stephen Rothwell]

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: pgpys2htFXrxp.pgp
Description: OpenPGP digital signature