Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-04-23

The following pull-request contains BPF updates for your *net-next* tree.

We've added 69 non-merge commits during the last 22 day(s) which contain
a total of 69 files changed, 3141 insertions(+), 866 deletions(-).

The main changes are:

1) Add BPF static linker support for extern resolution of global, from Andrii.

2) Refine retval for bpf_get_task_stack helper, from Dave.

3) Add a bpf_snprintf helper, from Florent.

4) A bunch of miscellaneous improvements from many developers.
====================

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

diff --cc include/linux/bpf.h
Simple merge

diff --cc include/linux/skmsg.h
index e242bf3,e2fb0a5..aba0f0f
--- 1/include/linux/skmsg.h
--- 2/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@@ -403,8 -404,9 +404,8 @@@ static inline void sk_psock_cork_free(s
  static inline void sk_psock_restore_proto(struct sock *sk,
                                          struct sk_psock *psock)
  {
 -      sk->sk_prot->unhash = psock->saved_unhash;
        if (psock->psock_update_sk_prot)
-               psock->psock_update_sk_prot(sk, true);
+               psock->psock_update_sk_prot(sk, psock, true);
  }
  
  static inline void sk_psock_set_state(struct sk_psock *psock,

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/bpf/inode.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/tcp_bpf.c
Simple merge