Update to 5.10.14-1

3 files changed, 12 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3768f7a48e6d..368ca9c54200 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-ck
-	pkgver = 5.10.13
-	pkgrel = 3
+	pkgver = 5.10.14
+	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
 	license = GPL2
@@ -12,24 +12,24 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.13.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.13.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.14.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.14.tar.sign
 	source = config
 	source = enable_additional_cpu_optimizations-20201113.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20201113.tar.gz
 	source = http://ck.kolivas.org/patches/5.0/5.10/5.10-ck1/patch-5.10-ck1.xz
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
-	source = 0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
+	source = 0003-SUNRPC-Fix-NFS-READs-the-start-at-non-page-aligned-o.patch::https://github.com/torvalds/linux/commit/bad4c6eb5eaa8300e065bd4426727db5141d687d.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	b2sums = f2d6f5512c10ced0990d0d0cbc1aa29e5b54b90bff01f16d16093e9c192de9eb0f31e60c9dd51c686ce88c2a1d89a49bedb503af61c91a6a186794fbe71eedde
+	b2sums = 34ba86c15532eff73ed3cd5d34bb125a534776425a98c43ceff187a9f950c4a12afbe35c5e63306150cdeff5d4e43c5094182d6533381661fe6e5ce82aeaed16
 	b2sums = SKIP
 	b2sums = 23b4034c8a462fe10ae3d6d9cd57a16b743576e831379e075625262c26e597f6b289aff6962509d73774b3cc03b78884651ff09d63507c099c0f9f0d6d9b4572
 	b2sums = 7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127
 	b2sums = 067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a
 	b2sums = de81e92b92ba697e472d6397faa425ebcc09bede6c97008dcae47efd341d2eaa12ec72209c4cc97155df01358e1fce3a86d3f0b5441ac91615037de72105defc
 	b2sums = 9450bd3d4acfa94723eaf22f2c0a13ae3bdb1ceb15ad19d1a1de2fc8d9a7b9b8f759006fd5b4286da135c68bac75791b4bf767ece8b6c40aff95799296ee0327
-	b2sums = 4a40db184421fdda2b01efe22adee7a4e1ce82cbc877bfaea5aaaae7215d1fe9aeb307a5241af6b7b9e539ae3d1a26f35adaedce82c61d3edb60f6e0d1673743
+	b2sums = d6bb0e91f5a5d263648b73aacf4e8aa4a7148daee887017a3a8b67ecfda1c3b592a14eeb2ee405535c9bd509c1318a99ab69651a00e62d55a7c8da6fa2b28fa5
 
 pkgname = linux-ck
 	pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
diff --git a/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch b/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
deleted file mode 100644
index ea9af039cfb9..000000000000
--- a/0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 78a29b77d3643814a19ce55937309b89010a763c Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Sun, 31 Jan 2021 16:38:13 -0500
-Subject: [PATCH] Revert "SUNRPC: Handle TCP socket sends with
- kernel_sendpage() again"
-
-This reverts commit 00ee972739fb2526d3936f1e7ccfc8c91d250c60.
----
- net/sunrpc/svcsock.c | 86 +-------------------------------------------
- 1 file changed, 1 insertion(+), 85 deletions(-)
-
-diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
-index c9766d07eb81..b248f2349437 100644
---- a/net/sunrpc/svcsock.c
-+++ b/net/sunrpc/svcsock.c
-@@ -1062,90 +1062,6 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
- 	return 0;	/* record not complete */
- }
- 
--static int svc_tcp_send_kvec(struct socket *sock, const struct kvec *vec,
--			      int flags)
--{
--	return kernel_sendpage(sock, virt_to_page(vec->iov_base),
--			       offset_in_page(vec->iov_base),
--			       vec->iov_len, flags);
--}
--
--/*
-- * kernel_sendpage() is used exclusively to reduce the number of
-- * copy operations in this path. Therefore the caller must ensure
-- * that the pages backing @xdr are unchanging.
-- *
-- * In addition, the logic assumes that * .bv_len is never larger
-- * than PAGE_SIZE.
-- */
--static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg,
--			   struct xdr_buf *xdr, rpc_fraghdr marker,
--			   unsigned int *sentp)
--{
--	const struct kvec *head = xdr->head;
--	const struct kvec *tail = xdr->tail;
--	struct kvec rm = {
--		.iov_base	= &marker,
--		.iov_len	= sizeof(marker),
--	};
--	int flags, ret;
--
--	*sentp = 0;
--	xdr_alloc_bvec(xdr, GFP_KERNEL);
--
--	msg->msg_flags = MSG_MORE;
--	ret = kernel_sendmsg(sock, msg, &rm, 1, rm.iov_len);
--	if (ret < 0)
--		return ret;
--	*sentp += ret;
--	if (ret != rm.iov_len)
--		return -EAGAIN;
--
--	flags = head->iov_len < xdr->len ? MSG_MORE | MSG_SENDPAGE_NOTLAST : 0;
--	ret = svc_tcp_send_kvec(sock, head, flags);
--	if (ret < 0)
--		return ret;
--	*sentp += ret;
--	if (ret != head->iov_len)
--		goto out;
--
--	if (xdr->page_len) {
--		unsigned int offset, len, remaining;
--		struct bio_vec *bvec;
--
--		bvec = xdr->bvec;
--		offset = xdr->page_base;
--		remaining = xdr->page_len;
--		flags = MSG_MORE | MSG_SENDPAGE_NOTLAST;
--		while (remaining > 0) {
--			if (remaining <= PAGE_SIZE && tail->iov_len == 0)
--				flags = 0;
--			len = min(remaining, bvec->bv_len);
--			ret = kernel_sendpage(sock, bvec->bv_page,
--					      bvec->bv_offset + offset,
--					      len, flags);
--			if (ret < 0)
--				return ret;
--			*sentp += ret;
--			if (ret != len)
--				goto out;
--			remaining -= len;
--			offset = 0;
--			bvec++;
--		}
--	}
--
--	if (tail->iov_len) {
--		ret = svc_tcp_send_kvec(sock, tail, 0);
--		if (ret < 0)
--			return ret;
--		*sentp += ret;
--	}
--
--out:
--	return 0;
--}
--
- /**
-  * svc_tcp_sendto - Send out a reply on a TCP socket
-  * @rqstp: completed svc_rqst
-@@ -1173,7 +1089,7 @@ static int svc_tcp_sendto(struct svc_rqst *rqstp)
- 	mutex_lock(&xprt->xpt_mutex);
- 	if (svc_xprt_is_dead(xprt))
- 		goto out_notconn;
--	err = svc_tcp_sendmsg(svsk->sk_sock, &msg, xdr, marker, &sent);
-+	err = xprt_sock_sendmsg(svsk->sk_sock, &msg, xdr, 0, marker, &sent);
- 	xdr_free_bvec(xdr);
- 	trace_svcsock_tcp_send(xprt, err < 0 ? err : sent);
- 	if (err < 0 || sent != (xdr->len + sizeof(marker)))
--- 
-2.30.0
-
diff --git a/PKGBUILD b/PKGBUILD
index a726c57cbfd3..6e92ac6de76b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,8 +64,8 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-ck
-pkgver=5.10.13
-pkgrel=3
+pkgver=5.10.14
+pkgrel=1
 _ckpatchversion=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -83,20 +83,20 @@ source=(
   "http://ck.kolivas.org/patches/5.0/5.10/5.10-ck${_ckpatchversion}/$_ckpatch.xz"
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
-  0003-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch
+  0003-SUNRPC-Fix-NFS-READs-the-start-at-non-page-aligned-o.patch::https://github.com/torvalds/linux/commit/bad4c6eb5eaa8300e065bd4426727db5141d687d.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-b2sums=('f2d6f5512c10ced0990d0d0cbc1aa29e5b54b90bff01f16d16093e9c192de9eb0f31e60c9dd51c686ce88c2a1d89a49bedb503af61c91a6a186794fbe71eedde'
+b2sums=('34ba86c15532eff73ed3cd5d34bb125a534776425a98c43ceff187a9f950c4a12afbe35c5e63306150cdeff5d4e43c5094182d6533381661fe6e5ce82aeaed16'
         'SKIP'
         '23b4034c8a462fe10ae3d6d9cd57a16b743576e831379e075625262c26e597f6b289aff6962509d73774b3cc03b78884651ff09d63507c099c0f9f0d6d9b4572'
         '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
         '067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a'
         'de81e92b92ba697e472d6397faa425ebcc09bede6c97008dcae47efd341d2eaa12ec72209c4cc97155df01358e1fce3a86d3f0b5441ac91615037de72105defc'
         '9450bd3d4acfa94723eaf22f2c0a13ae3bdb1ceb15ad19d1a1de2fc8d9a7b9b8f759006fd5b4286da135c68bac75791b4bf767ece8b6c40aff95799296ee0327'
-        '4a40db184421fdda2b01efe22adee7a4e1ce82cbc877bfaea5aaaae7215d1fe9aeb307a5241af6b7b9e539ae3d1a26f35adaedce82c61d3edb60f6e0d1673743')
+        'd6bb0e91f5a5d263648b73aacf4e8aa4a7148daee887017a3a8b67ecfda1c3b592a14eeb2ee405535c9bd509c1318a99ab69651a00e62d55a7c8da6fa2b28fa5')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase