Merge remote-tracking branch 'bpf-next/for-next'

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

diff --cc include/linux/skmsg.h
index e242bf3d2b4a39b269a5fcf85b34d037badae826,e2fb0a5a101e983f7f47ef00aa9dc40947c90772..aba0f0f429bec0d1051a370714248f5d0d821776
--- 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 net/ipv4/tcp_bpf.c
Simple merge

diff --cc scripts/link-vmlinux.sh
Simple merge