diff for duplicates of <20230623225513.2732256-16-dhowells@redhat.com>

diff --git a/a/1.txt b/N1/1.txt
index b11d04c..81003f6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -877,10 +877,10 @@ index 31d6005cea9b..81f0dff69e0b 100644
 @@ -647,8 +629,7 @@ static int tcp_bpf_assert_proto_ops(struct proto *ops)
  	 * indeed valid assumptions.
  	 */
- 	return ops->recvmsg  == tcp_recvmsg &&
--	       ops->sendmsg  == tcp_sendmsg &&
--	       ops->sendpage == tcp_sendpage ? 0 : -ENOTSUPP;
-+	       ops->sendmsg  == tcp_sendmsg ? 0 : -ENOTSUPP;
+ 	return ops->recvmsg  = tcp_recvmsg &&
+-	       ops->sendmsg  = tcp_sendmsg &&
+-	       ops->sendpage = tcp_sendpage ? 0 : -ENOTSUPP;
++	       ops->sendmsg  = tcp_sendmsg ? 0 : -ENOTSUPP;
  }
  
  int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)
@@ -1092,8 +1092,7 @@ index 9ffbc667be6c..57c35c960b2c 100644
 -	.sendpage    = sock_no_sendpage,
  };
  
- static const char llc_proc_err_msg[] __initconst =
-diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
+ static const char llc_proc_err_msg[] __initconst diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
 index bb4bd0b6a4f7..f6be58b68c6f 100644
 --- a/net/mctp/af_mctp.c
 +++ b/net/mctp/af_mctp.c
diff --git a/a/content_digest b/N1/content_digest
index 268ac0b..36805d4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,39 +1,7 @@
- "ref\020230623225513.2732256-1-dhowells@redhat.com\0"
  "From\0David Howells <dhowells@redhat.com>\0"
  "Subject\0[PATCH net-next v5 15/16] sock: Remove ->sendpage*() in favour of sendmsg(MSG_SPLICE_PAGES)\0"
- "Date\0Fri, 23 Jun 2023 23:55:12 +0100\0"
- "To\0netdev@vger.kernel.org\0"
- "Cc\0David Howells <dhowells@redhat.com>"
-  Alexander Duyck <alexander.duyck@gmail.com>
-  David S. Miller <davem@davemloft.net>
-  Eric Dumazet <edumazet@google.com>
-  Jakub Kicinski <kuba@kernel.org>
-  Paolo Abeni <pabeni@redhat.com>
-  Willem de Bruijn <willemdebruijn.kernel@gmail.com>
-  David Ahern <dsahern@kernel.org>
-  Matthew Wilcox <willy@infradead.org>
-  Jens Axboe <axboe@kernel.dk>
-  linux-mm@kvack.org
-  linux-kernel@vger.kernel.org
-  Marc Kleine-Budde <mkl@pengutronix.de>
-  bpf@vger.kernel.org
-  dccp@vger.kernel.org
-  linux-afs@lists.infradead.org
-  linux-arm-msm@vger.kernel.org
-  linux-can@vger.kernel.org
-  linux-crypto@vger.kernel.org
-  linux-doc@vger.kernel.org
-  linux-fsdevel@vger.kernel.org
-  linux-hams@vger.kernel.org
-  linux-nfs@vger.kernel.org
-  linux-rdma@vger.kernel.org
-  linux-sctp@vger.kernel.org
-  linux-wpan@vger.kernel.org
-  linux-x25@vger.kernel.org
-  mptcp@lists.linux.dev
-  rds-devel@oss.oracle.com
-  tipc-discussion@lists.sourceforge.net
- " virtualization@lists.linux-foundation.org\0"
+ "Date\0Fri, 23 Jun 2023 22:55:12 +0000\0"
+ "To\0dccp@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Remove ->sendpage() and ->sendpage_locked().  sendmsg() with\n"
@@ -915,10 +883,10 @@
  "@@ -647,8 +629,7 @@ static int tcp_bpf_assert_proto_ops(struct proto *ops)\n"
  " \t * indeed valid assumptions.\n"
  " \t */\n"
- " \treturn ops->recvmsg  == tcp_recvmsg &&\n"
- "-\t       ops->sendmsg  == tcp_sendmsg &&\n"
- "-\t       ops->sendpage == tcp_sendpage ? 0 : -ENOTSUPP;\n"
- "+\t       ops->sendmsg  == tcp_sendmsg ? 0 : -ENOTSUPP;\n"
+ " \treturn ops->recvmsg  = tcp_recvmsg &&\n"
+ "-\t       ops->sendmsg  = tcp_sendmsg &&\n"
+ "-\t       ops->sendpage = tcp_sendpage ? 0 : -ENOTSUPP;\n"
+ "+\t       ops->sendmsg  = tcp_sendmsg ? 0 : -ENOTSUPP;\n"
  " }\n"
  " \n"
  " int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)\n"
@@ -1130,8 +1098,7 @@
  "-\t.sendpage    = sock_no_sendpage,\n"
  " };\n"
  " \n"
- " static const char llc_proc_err_msg[] __initconst =\n"
- "diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c\n"
+ " static const char llc_proc_err_msg[] __initconst diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c\n"
  "index bb4bd0b6a4f7..f6be58b68c6f 100644\n"
  "--- a/net/mctp/af_mctp.c\n"
  "+++ b/net/mctp/af_mctp.c\n"
@@ -1634,4 +1601,4 @@
  " \n"
   static void xsk_destruct(struct sock *sk)
 
-d322e91daa838e7c6f5da3e090c07b101436d5159b06b1b23a8f18bcaa42005d
+27ca0de6de460b48d2e595edd79744b72e5fc373846090806b62a48523c9069d
