Bump to 4.19.8-1

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

3 files changed, 18 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f92c008db56..3454f6ccf425 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-bfq-mq
-	pkgver = 4.19.7
-	pkgrel = 3
+	pkgver = 4.19.8
+	pkgrel = 1
 	url = https://github.com/Algodev-github/bfq-mq/
 	arch = x86_64
 	license = GPL2
@@ -11,8 +11,8 @@ pkgbase = linux-bfq-mq
 	makedepends = python-sphinx
 	makedepends = graphviz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.7.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.7.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.8.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.8.tar.sign
 	source = https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v8.1+_kernel_v4.13+.patch
 	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.19/bfq-sq-mq/4.19-bfq-sq-mq-v9r1-2K181206-rc2.patch
 	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.19/0100-Check-presence-on-tree-of-every-entity-after-every-a.patch
@@ -22,9 +22,8 @@ pkgbase = linux-bfq-mq
 	source = 99-linux.hook
 	source = linux.preset
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
-	source = 0002-blk-mq-fix-corruption-with-direct-issue.patch
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 84d7aa436e10690b53165b9d59ec20548e6a4ce3324b135c5019fb0f7dd2a2d2
+	sha256sums = d540d066f307f13f0cfe7e097373cd1af2cc4866b5e36a503775b4e69167e171
 	sha256sums = SKIP
 	sha256sums = 9f7177679c8d3f8d699ef0566a51349d828436dba04603bc2223f98c60d2d178
 	sha256sums = bd5fa32445dcd1127ddaca3d3189436557e195090998d5c9b6d1d1a801b56978
@@ -35,7 +34,6 @@ pkgbase = linux-bfq-mq
 	sha256sums = ed9d35cb7d7bd829ff6253353efa5e2d119820fe4f4310aea536671f5e4caa37
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 37c115ad797afc7e47615dc56c6416932b6645e16da097ddcfa401df41a31248
-	sha256sums = c4512061dbbc349f13f0001f8ebea9e311cdbe53a7bda40f444aaea33fcdd14f
 
 pkgname = linux-bfq-mq
 	pkgdesc = The Linux-bfq-mq kernel and modules with the BFQ-MQ scheduler
@@ -46,19 +44,19 @@ pkgname = linux-bfq-mq
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
-	provides = linux-bfq-mq=4.19.7
-	provides = linux=4.19.7
+	provides = linux-bfq-mq=4.19.8
+	provides = linux=4.19.8
 	backup = etc/mkinitcpio.d/linux-bfq-mq.preset
 
 pkgname = linux-bfq-mq-headers
 	pkgdesc = Header files and scripts for building modules for Linux-bfq-mq kernel
-	depends = linux-bfq-mq=4.19.7
-	provides = linux-bfq-mq-headers=4.19.7
-	provides = linux-headers=4.19.7
+	depends = linux-bfq-mq=4.19.8
+	provides = linux-bfq-mq-headers=4.19.8
+	provides = linux-headers=4.19.8
 
 pkgname = linux-bfq-mq-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-bfq-mq kernel
-	depends = linux-bfq-mq=4.19.7
-	provides = linux-bfq-mq-docs=4.19.7
-	provides = linux-docs=4.19.7
+	depends = linux-bfq-mq=4.19.8
+	provides = linux-bfq-mq-docs=4.19.8
+	provides = linux-docs=4.19.8
 
diff --git a/0002-blk-mq-fix-corruption-with-direct-issue.patch b/0002-blk-mq-fix-corruption-with-direct-issue.patch
deleted file mode 100644
index 5ca4828bc1f9..000000000000
--- a/0002-blk-mq-fix-corruption-with-direct-issue.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 144c54b5c08cc1afc060281a79a9892e898337c6 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@kernel.dk>
-Date: Tue, 4 Dec 2018 15:47:46 -0700
-Subject: [PATCH 2/2] blk-mq: fix corruption with direct issue
-
-If we attempt a direct issue to a SCSI device, and it returns BUSY, then
-we queue the request up normally. However, the SCSI layer may have
-already setup SG tables etc for this particular command. If we later
-merge with this request, then the old tables are no longer valid. Once
-we issue the IO, we only read/write the original part of the request,
-not the new state of it.
-
-This causes data corruption, and is most often noticed with the file
-system complaining about the just read data being invalid:
-
-[  235.934465] EXT4-fs error (device sda1): ext4_iget:4831: inode #7142: comm dpkg-query: bad extra_isize 24937 (inode size 256)
-
-because most of it is garbage...
-
-This doesn't happen from the normal issue path, as we will simply defer
-the request to the hardware queue dispatch list if we fail. Once it's on
-the dispatch list, we never merge with it.
-
-Fix this from the direct issue path by flagging the request as
-REQ_NOMERGE so we don't change the size of it before issue.
-
-See also:
-  https://bugzilla.kernel.org/show_bug.cgi?id=201685
-
-Fixes: 6ce3dd6eec1 ("blk-mq: issue directly if hw queue isn't busy in case of 'none'")
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Tested-by: Guenter Roeck <linux@roeck-us.net>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
----
- block/blk-mq.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/block/blk-mq.c b/block/blk-mq.c
-index e3c39ea8e17b..66d64a13c50a 100644
---- a/block/blk-mq.c
-+++ b/block/blk-mq.c
-@@ -1698,6 +1698,15 @@ static blk_status_t __blk_mq_issue_directly(struct blk_mq_hw_ctx *hctx,
- 		break;
- 	case BLK_STS_RESOURCE:
- 	case BLK_STS_DEV_RESOURCE:
-+		/*
-+		 * If direct dispatch fails, we cannot allow any merging on
-+		 * this IO. Drivers (like SCSI) may have set up permanent state
-+		 * for this request, like SG tables and mappings, and if we
-+		 * merge to it later on then we'll still only do IO to the
-+		 * original part.
-+		 */
-+		rq->cmd_flags |= REQ_NOMERGE;
-+
- 		blk_mq_update_dispatch_busy(hctx, true);
- 		__blk_mq_requeue_request(rq);
- 		break;
--- 
-2.20.0.rc2.7.g965798d1f2
-
diff --git a/PKGBUILD b/PKGBUILD
index 98e2106483d7..785dd791025e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -61,10 +61,10 @@ _1k_HZ_ticks=
 pkgbase=linux-bfq-mq
 #pkgbase=linux-custom       # Build kernel with a different name
 _major=4.19
-pkgver=4.19.7
+pkgver=4.19.8
 _srcpatch="${pkgver}"
 _srcname="linux-${pkgver}"
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -98,10 +98,9 @@ source=(# mainline kernel patches
         '99-linux.hook'
          # standard config files for mkinitcpio ramdisk
         'linux.preset'
-        '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
-        '0002-blk-mq-fix-corruption-with-direct-issue.patch')
+        '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch')
 
-sha256sums=('84d7aa436e10690b53165b9d59ec20548e6a4ce3324b135c5019fb0f7dd2a2d2'
+sha256sums=('d540d066f307f13f0cfe7e097373cd1af2cc4866b5e36a503775b4e69167e171'
             'SKIP'
             '9f7177679c8d3f8d699ef0566a51349d828436dba04603bc2223f98c60d2d178'
             'bd5fa32445dcd1127ddaca3d3189436557e195090998d5c9b6d1d1a801b56978'
@@ -111,8 +110,7 @@ sha256sums=('84d7aa436e10690b53165b9d59ec20548e6a4ce3324b135c5019fb0f7dd2a2d2'
             'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
             'ed9d35cb7d7bd829ff6253353efa5e2d119820fe4f4310aea536671f5e4caa37'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '37c115ad797afc7e47615dc56c6416932b6645e16da097ddcfa401df41a31248'
-            'c4512061dbbc349f13f0001f8ebea9e311cdbe53a7bda40f444aaea33fcdd14f')
+            '37c115ad797afc7e47615dc56c6416932b6645e16da097ddcfa401df41a31248')
 validpgpkeys=(
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
              )