Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-10-27 10:31:44 +02:00
parent 57646b6fda 2eece390bf
commit 6856b8e536
260 changed files with 3029 additions and 1371 deletions
@@ -569,9 +569,10 @@ union bpf_attr {
 *     @flags: reserved for future use
 *     Return: 0 on success or negative error code
 *
- * int bpf_sk_redirect_map(map, key, flags)
+ * int bpf_sk_redirect_map(skb, map, key, flags)
 *     Redirect skb to a sock in map using key as a lookup key for the
 *     sock in map.
+ *     @skb: pointer to skb
 *     @map: pointer to sockmap
 *     @key: key to lookup sock in map
 *     @flags: reserved for future use