Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  drivers/char/random.c

between commit:

  b48e412a0b73 ("random: selectively clang-format where it makes sense")

from the random tree and patch:

  "random: move the random sysctl declarations to its own file"

from the akpm 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 b04664fa61a2,2ce43609dbc8..000000000000
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@@ -2055,7 -2076,18 +2054,18 @@@ static struct ctl_table random_table[] 
  #endif
  	{ }
  };
+ 
+ /*
+  * rand_initialize() is called before sysctl_init(),
+  * so we cannot call register_sysctl_init() in rand_initialize()
+  */
+ static int __init random_sysctls_init(void)
+ {
+ 	register_sysctl_init("kernel/random", random_table);
+ 	return 0;
+ }
+ device_initcall(random_sysctls_init);
 -#endif 	/* CONFIG_SYSCTL */
 +#endif	/* CONFIG_SYSCTL */
  
  struct batched_entropy {
  	union {