nvme fix

3 files changed, 28 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72616a825f9f..c991e54af3be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = linux-lts510
+pkgbase = linux-lts510-nvme-fix
 	pkgdesc = LTS 5.10 Linux
-	pkgver = 5.10.146
+	pkgver = 5.10.147
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -20,18 +20,20 @@ pkgbase = linux-lts510
 	makedepends = graphviz
 	makedepends = imagemagick
 	options = !strip
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.146.tar.xz
-	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.146.tar.sign
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.147.tar.xz
+	source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.147.tar.sign
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+	source = 02-fix-nvme.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 7bbd97f3278eadb73c19a1ca8c1a655c60afcee9f487b910063cdd15e9ee6dc1
+	sha256sums = 85253abf097eb5013b988a400eb022eed0e0626e7e0a7daa3ab4b6bcabbced9a
 	sha256sums = SKIP
 	sha256sums = 2367f59976f6fc902d226229564a98f5d1df3a91e742a292c3deccc3e4a8ffc0
 	sha256sums = 96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e
+	sha256sums = 0e14c0d788262a9781d8ba1d6e894f30877f015ccf0b6d768d759eac48bcede9
 
-pkgname = linux-lts510
+pkgname = linux-lts510-nvme-fix
 	pkgdesc = The LTS 5.10 Linux kernel and modules
 	depends = coreutils
 	depends = kmod
@@ -41,8 +43,8 @@ pkgname = linux-lts510
 	provides = VIRTUALBOX-GUEST-MODULES
 	provides = WIREGUARD-MODULE
 
-pkgname = linux-lts510-headers
+pkgname = linux-lts510-nvme-fix-headers
 	pkgdesc = Headers and scripts for building modules for the LTS 5.10 Linux kernel
 
-pkgname = linux-lts510-docs
+pkgname = linux-lts510-nvme-fix-docs
 	pkgdesc = Documentation for the LTS 5.10 Linux kernel
diff --git a/02-fix-nvme.patch b/02-fix-nvme.patch
new file mode 100644
index 000000000000..72bb4aebfdc9
--- /dev/null
+++ b/02-fix-nvme.patch
@@ -0,0 +1,10 @@
+--- linux-5.10.146/drivers/nvme/host/core.c	2022-09-28 17:10:41.000000000 +0800
++++ linux-5.10.146/drivers/nvme/host/core.patch.c	2022-10-06 21:14:13.604143325 +0800
+@@ -4049,7 +4049,6 @@ static void nvme_validate_ns(struct nvme
+ 	if (!nvme_ns_ids_equal(&ns->head->ids, ids)) {
+ 		dev_err(ns->ctrl->device,
+ 			"identifiers changed for nsid %d\n", ns->head->ns_id);
+-		goto out_free_id;
+ 	}
+ 
+ 	ret = nvme_update_ns_info(ns, id);
diff --git a/PKGBUILD b/PKGBUILD
index 6e59a45b9560..6ccf954ec158 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Jonathon Fernyhough <jonathon+m2x+dev>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
-pkgbase=linux-lts510
-pkgver=5.10.146
+pkgbase=linux-lts510-nvme-fix
+pkgver=5.10.147
 pkgrel=1
 pkgdesc='LTS 5.10 Linux'
 url="https://www.kernel.org/"
@@ -18,16 +18,18 @@ source=(
   https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
   config         # the main kernel config file
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+  02-fix-nvme.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('7bbd97f3278eadb73c19a1ca8c1a655c60afcee9f487b910063cdd15e9ee6dc1'
+sha256sums=('85253abf097eb5013b988a400eb022eed0e0626e7e0a7daa3ab4b6bcabbced9a'
             'SKIP'
             '2367f59976f6fc902d226229564a98f5d1df3a91e742a292c3deccc3e4a8ffc0'
-            '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e')
+            '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e'
+            '0e14c0d788262a9781d8ba1d6e894f30877f015ccf0b6d768d759eac48bcede9')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -53,15 +55,14 @@ prepare() {
   echo "Setting config..."
   cp ../config .config
   make olddefconfig
-
   make -s kernelrelease > version
   echo "Prepared $pkgbase version $(<version)"
 }
 
 build() {
   cd $_srcname
-  make all
-  make htmldocs
+  make -j4 all
+  make -j4 htmldocs
 }
 
 _package() {