linux-next: manual merge of the akpm tree with the net and net-next trees

linux-next: manual merge of the akpm tree with the net and net-next trees

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2401 bytes --]

Hi all,

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

  net/ipv4/sysctl_net_ipv4.c
  kernel/sysctl.c

between commit:

  a8e11e5c5611 ("sysctl: define proc_do_static_key()")

from the net tree, commit:

  363887a2cdfe ("ipv4: Support multipath hashing on inner IP pkts for GRE tunnel")

from the net-next tree and patch:

  "proc/sysctl: add shared variables for range check"

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 kernel/sysctl.c
index d2a7398a5543,f9c1a8390d95..000000000000
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -3367,21 -3371,13 +3364,21 @@@ int proc_do_large_bitmap(struct ctl_tab
  
  #endif /* CONFIG_PROC_SYSCTL */
  
 -#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
 -static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
 -					  void __user *buffer, size_t *lenp,
 -					  loff_t *ppos)
 +#if defined(CONFIG_SYSCTL)
 +int proc_do_static_key(struct ctl_table *table, int write,
 +		       void __user *buffer, size_t *lenp,
 +		       loff_t *ppos)
  {
 -	int ret, bpf_stats = *(int *)table->data;
 -	struct ctl_table tmp = *table;
 +	struct static_key *key = (struct static_key *)table->data;
 +	static DEFINE_MUTEX(static_key_mutex);
 +	int val, ret;
 +	struct ctl_table tmp = {
 +		.data   = &val,
 +		.maxlen = sizeof(val),
 +		.mode   = table->mode,
- 		.extra1 = &zero,
- 		.extra2 = &one,
++		.extra1 = SYSCTL_ZERO,
++		.extra2 = SYSCTL_ONE,
 +	};
  
  	if (write && !capable(CAP_SYS_ADMIN))
  		return -EPERM;
diff --cc net/ipv4/sysctl_net_ipv4.c
index 356e8cf6f78d,cf5b4462fd42..000000000000
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -1019,8 -1005,8 +1017,8 @@@ static struct ctl_table ipv4_net_table[
  		.maxlen		= sizeof(int),
  		.mode		= 0644,
  		.proc_handler	= proc_fib_multipath_hash_policy,
- 		.extra1		= &zero,
+ 		.extra1		= SYSCTL_ZERO,
 -		.extra2		= SYSCTL_ONE,
 +		.extra2		= &two,
  	},
  #endif
  	{

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]