summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-18 19:19:24 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2020-09-18 19:19:24 -0700
commit951741e10229aeadeaf66f4873def7beaab194ae (patch)
tree7700b222b244ef4a77547fbbf52f8f19759543d5
parentUpdated to 5.8.9.a (diff)
downloadlinux-libre-hardened-951741e10229aeadeaf66f4873def7beaab194ae.tar.xz
Updated to 5.8.10.a
-rw-r--r--0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch33
-rw-r--r--PKGBUILD11
-rw-r--r--config5
3 files changed, 5 insertions, 44 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
deleted file mode 100644
index 1de46c0..0000000
--- a/0003-block-restore-a-specific-error-code-in-bdev_del_partition.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 ba702d6..8d637c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _pkgbase=linux-hardened
pkgbase=linux-libre-hardened
_supver=5
_majver=8
-_minver=9
+_minver=10
_hardenedver=a
_gccpatchver='20200615'
_gccpatchger='10.1'
@@ -50,7 +50,6 @@ source=(
https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.patch{,.sig}
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
@@ -66,16 +65,15 @@ validpgpkeys=(
)
b2sums=('30db9a0143db9824e69c772d4a6634527dfe0aa6fb2dad8177facd57d4e2587a3344a174e48f7d35cb1b3fce00f274143be2495239cba09e6b95e06029a29183'
'SKIP'
- 'c6f2db6af87fd40401158833862b887182576c55b27a5c39582f2a97c57c51a280edc3e26002a7ac97a23c3638d13bc1a0e008e5c78a9221ee8a53428e8a57e9'
+ 'c3429077695c7cfa5a7d0a7d947c56ac4572516a81551a70f2de3d19a33e43e00650c3022b9c7d3b8bfed6b96bb5577a8cd4f0730cb1ad470d5ff59653574ea3'
'SKIP'
'e54020096951d8e1adb06f524259238fe56922f535f44645d30e4645ac0cb53264afc4840ff77052e3fe8bea4d1a5199d5909041596f0fdfa60203f3ef34248c'
- 'cd01b383a1f81b5112a12882f221cb36f3ca22788c29c505630264c92a966649f313518da773cbdcb039d03a84644cea908195be07eb136bca78c215a03a7038'
'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c'
'2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
- '89e52afc9b46cdecab83b5b3bcbc125a097b41f9780f01ce1e42a78dd5af399e67409dfe89a950a70825ec7d8423a18f971f6d20fb663b103be99a29b2872446'
+ '675e86fbb9ea47cd67de5fec4ecca43b67f8dda3c8509001fa03f7768155cc2f550afc08aad7973a5fcba4eaab669e66586aa2058f940b851a2d0d6d6502a7b8'
'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
- 'b5d61b957753221758b0935865772d1346c2abbb016cd55c5fd7c09a679dd08d7234e3f09ad1045ead0aa44532d740b707e45f4eacda1c51ab2e4081cc790e94'
+ '4602be85ea6dc92ab06ce477ea5ca82035248cf3428244aa8345777653ea19183d069556d0131e38bc4cd724764b7aef75fa8957ef97a8a8d028f281b6a2f93c'
'SKIP')
export KBUILD_BUILD_HOST=$pkgbase
@@ -95,7 +93,6 @@ prepare() {
# Hotfixes
echo "Applying hotfixes"
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
diff --git a/config b/config
index b77715a..edcf1da 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.8.6 Kernel Configuration
+# Linux/x86 5.8.10 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -6789,9 +6789,6 @@ CONFIG_HDMI=y
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-# CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_DUMMY_CONSOLE_COLUMNS=80
CONFIG_DUMMY_CONSOLE_ROWS=25