bpf: Rework bpf_redirect_neigh() to allow supplying nexthop from caller

[kernel-patches-bot]

Pull request for series with
subject: bpf: Rework bpf_redirect_neigh() to allow supplying nexthop from caller
version: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=367859

[kernel-patches-bot]

Master branch: c5eb48e
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=367859
version: 3

[kernel-patches-bot]

Master branch: adfd272
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=367859
version: 3

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=367859
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpf_redirect_neigh: Support supplying the nexthop as a helper parameter
Using index info to reconstruct a base tree...
M	include/linux/filter.h
M	include/uapi/linux/bpf.h
M	net/core/filter.c
M	scripts/bpf_helpers_doc.py
M	tools/include/uapi/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging net/core/filter.c
CONFLICT (content): Merge conflict in net/core/filter.c
Auto-merging include/linux/filter.h
CONFLICT (content): Merge conflict in include/linux/filter.h
Patch failed at 0001 bpf_redirect_neigh: Support supplying the nexthop as a helper parameter
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch'

conflict:

diff --cc include/linux/filter.h
index 72d62cbc1578,083a9fbb2c0b..000000000000
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@@ -610,7 -610,7 +610,11 @@@ struct bpf_skb_data_end 
  struct bpf_nh_params {
  	u32 nh_family;
  	union {
++<<<<<<< HEAD
 +		u32 ipv4_nh;
++=======
+ 		__u32 ipv4_nh;
++>>>>>>> bpf_redirect_neigh: Support supplying the nexthop as a helper parameter
  		struct in6_addr ipv6_nh;
  	};
  };
diff --cc net/core/filter.c
index 6d0fa65a4a46,a431b116e11a..000000000000
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@@ -2487,9 -2487,8 +2487,14 @@@ int skb_do_redirect(struct sk_buff *skb
  		return -EAGAIN;
  	}
  	return flags & BPF_F_NEIGH ?
++<<<<<<< HEAD
 +	       __bpf_redirect_neigh(skb, dev, flags & BPF_F_NEXTHOP ?
 +				    &ri->nh : NULL) :
 +	       __bpf_redirect(skb, dev, flags);
++=======
+ 		__bpf_redirect_neigh(skb, dev, flags & BPF_F_NEXTHOP ? &ri->nh : NULL) :
+ 		__bpf_redirect(skb, dev, flags);
++>>>>>>> bpf_redirect_neigh: Support supplying the nexthop as a helper parameter
  out_drop:
  	kfree_skb(skb);
  	return -EINVAL;

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=367859 irrelevant now. Closing PR.