From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 02:42:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'bpf-next/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0cacbd75e6645e34b514e49ac2c92464e7a88e8e;p=users%2Fjedix%2Flinux-maple.git

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

0cacbd75e6645e34b514e49ac2c92464e7a88e8e
diff --cc include/linux/skmsg.h
index e242bf3d2b4a,e2fb0a5a101e..aba0f0f429be
--- a/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,