summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-13 22:54:51 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-13 22:54:51 -0700
commitf23e4a6de3b857bccafd39b9cdaee06e6865f572 (patch)
tree6d722bcd2dd6629754bcf3cf70fa6e7dd47aca31
parentUpdated to 5.8.8 (diff)
downloadlinux-libre-f23e4a6de3b857bccafd39b9cdaee06e6865f572.tar.xz
Updated to 5.8.9
-rw-r--r--0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch33
-rw-r--r--PKGBUILD9
2 files changed, 39 insertions, 3 deletions
diff --git a/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch b/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch
new file mode 100644
index 0000000..1de46c0
--- /dev/null
+++ b/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch
@@ -0,0 +1,33 @@
+From 90b434f4088c347959313d01d46e207a00949f35 Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Tue, 8 Sep 2020 16:15:06 +0200
+Subject: block: restore a specific error code in bdev_del_partition
+
+mdadm relies on the fact that deleting an invalid partition returns
+-ENXIO or -ENOTTY to detect if a block device is a partition or a
+whole device.
+
+Fixes: 08fc1ab6d748 ("block: fix locking in bdev_del_partition")
+Reported-by: kernel test robot <rong.a.chen@intel.com>
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ block/partitions/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/partitions/core.c b/block/partitions/core.c
+index 534e11285a8d..b45539764c99 100644
+--- a/block/partitions/core.c
++++ b/block/partitions/core.c
+@@ -529,7 +529,7 @@ int bdev_del_partition(struct block_device *bdev, int partno)
+
+ bdevp = bdget_disk(bdev->bd_disk, partno);
+ if (!bdevp)
+- return -ENOMEM;
++ return -ENXIO;
+
+ mutex_lock(&bdevp->bd_mutex);
+ mutex_lock_nested(&bdev->bd_mutex, 1);
+--
+cgit v1.2.3-1-gf6bb5
+
diff --git a/PKGBUILD b/PKGBUILD
index 5a7c00f..33f1c91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
pkgbase=linux-libre
_supver=5
_majver=8
-_minver=8
+_minver=9
_gccpatchver='20200615'
_gccpatchger='10.1'
_gccpatchker='5.8'
@@ -24,7 +24,7 @@ _gccpatchker='5.8'
else
pkgver=${_supver}.${_majver}.${_minver}
fi
-pkgrel=1.2
+pkgrel=1
pkgdesc='Linux-libre'
url='https://linux-libre.fsfla.org/'
arch=(x86_64)
@@ -42,6 +42,7 @@ source=(
https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
+ 0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch
kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
ath9k-regdom-hack.patch
raid6-default-algo.patch
@@ -58,12 +59,13 @@ b2sums=('30db9a0143db9824e69c772d4a6634527dfe0aa6fb2dad8177facd57d4e2587a3344a17
'SKIP'
'dd8d62b88c0d79eb18b5695b39ca374657b5dd3f5c296a9b262b98e8d0058709b52ad4b56e69afe2fa3db25f944636b8b1eec951e40bd5d02b4127dde6cc4796'
'e54020096951d8e1adb06f524259238fe56922f535f44645d30e4645ac0cb53264afc4840ff77052e3fe8bea4d1a5199d5909041596f0fdfa60203f3ef34248c'
+ 'cd01b383a1f81b5112a12882f221cb36f3ca22788c29c505630264c92a966649f313518da773cbdcb039d03a84644cea908195be07eb136bca78c215a03a7038'
'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c'
'2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
'036c38a01e70d5320a35f39b917d9e70338f2df138de7bd449c52f1cc18862c13154074187af6f5bf26fbc0a2b71ee73ab588af8c9971b0b4604b102145afb67'
'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
- '37a52d4045f4cd6a1aa371856dd30a148fab9870a918324dc2b95a31efb32654989df5e129e0ae032e399f3a68e77ba7a8c94bca60cf795a22caeae934522291'
+ 'b5d61b957753221758b0935865772d1346c2abbb016cd55c5fd7c09a679dd08d7234e3f09ad1045ead0aa44532d740b707e45f4eacda1c51ab2e4081cc790e94'
'SKIP')
export KBUILD_BUILD_HOST=arc4linux
@@ -84,6 +86,7 @@ prepare() {
echo "Applying hotfixes"
patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
patch -p1 -i ../0002-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch
+ patch -p1 -i ../0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch
patch -p1 -i ../sphinx-workaround.patch