From: David S. Miller <davem@davemloft.net>
Date: Thu, 18 Aug 2016 05:17:32 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.9-rc1~14^2~87
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=60747ef4d173c2747bf7f0377fb22846cb422195;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

60747ef4d173c2747bf7f0377fb22846cb422195
diff --cc kernel/bpf/verifier.c
index 0cc46f1df358,daea765d72e6..abb61f3f6900
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -1078,8 -1053,7 +1078,8 @@@ static int check_map_func_compatibility
  			goto error;
  		break;
  	case BPF_MAP_TYPE_CGROUP_ARRAY:
- 		if (func_id != BPF_FUNC_skb_in_cgroup &&
 -		if (func_id != BPF_FUNC_skb_under_cgroup)
++		if (func_id != BPF_FUNC_skb_under_cgroup &&
 +		    func_id != BPF_FUNC_current_task_under_cgroup)
  			goto error;
  		break;
  	default:
@@@ -1101,8 -1075,7 +1101,8 @@@
  		if (map->map_type != BPF_MAP_TYPE_STACK_TRACE)
  			goto error;
  		break;
 +	case BPF_FUNC_current_task_under_cgroup:
- 	case BPF_FUNC_skb_in_cgroup:
+ 	case BPF_FUNC_skb_under_cgroup:
  		if (map->map_type != BPF_MAP_TYPE_CGROUP_ARRAY)
  			goto error;
  		break;