linux-next: manual merge of the bpf-next tree with the bpf tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  kernel/bpf/btf.c

between commit:

  5da7e15fb5a1 ("net: Add rx_skb of kfree_skb to raw_tp_null_args[].")

from the bpf tree and commit:

  c83e2d970bae ("bpf: Add tracepoints with null-able arguments")

from the bpf-next 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/bpf/btf.c
index c3223e0db2f5,f8335bdc8bf8..000000000000
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@@ -6507,8 -6505,8 +6505,10 @@@ static const struct bpf_raw_tp_null_arg
  	/* rxrpc */
  	{ "rxrpc_recvdata", 0x1 },
  	{ "rxrpc_resend", 0x10 },
+ 	{ "rxrpc_tq", 0x10 },
+ 	{ "rxrpc_client", 0x1 },
 +	/* skb */
 +	{"kfree_skb", 0x1000},
  	/* sunrpc */
  	{ "xs_stream_read_data", 0x1 },
  	/* ... from xprt_cong_event event class */

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