diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch | 39 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
3 files changed, 9 insertions, 56 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-uksm - pkgver = 4.14.1 + pkgver = 4.14.2 pkgrel = 1 url = https://github.com/dolohow/uksm arch = x86_64 @@ -11,8 +11,8 @@ pkgbase = linux-uksm options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.1.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.2.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.2.sign source = https://raw.githubusercontent.com/sirlucjan/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch source = https://raw.githubusercontent.com/dolohow/uksm/master/uksm-4.14.patch source = config @@ -21,12 +21,11 @@ pkgbase = linux-uksm source = 99-linux.hook source = linux.preset source = 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch - source = 0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha512sums = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 sha512sums = SKIP - sha512sums = 2566d2151cb0e0ad706dda3cb815e293d84ecc804cf2891e511a0f28e359b7714a1732add599a268c98108a63ee40200cf76cbda8181d67d0a64511e815202df + sha512sums = 04415954c3c4d3044a6a3da979e59fb18f0eda3fd872a8036ac8947fbbadcd6041384a900973b917353de6e5c1a589eff1db63c029edcb78f38b07868a929f9d sha512sums = SKIP sha512sums = 5ca7ae20245a54caa71fb570d971d6872d4e888f35c6123b93fbca16baf9a0e2500d6ec931f3906e4faecaaca9cad0d593694d9cab617efd0cb7b5fc09c0fa48 sha512sums = 44b31276d4d712e4e1e1455e128daa079ddd9d72a4620289607faf6134a225737004e8742de79e0283e98ef2d4f746f075e041870d37eab191c93c566f945c7f @@ -36,7 +35,6 @@ pkgbase = linux-uksm sha512sums = dc2b69f1463756ce0a7906e9ebedfb227eb4386f889a78932924ef1f576c9e02ad19e2d2510db0b864310e1d92fc3be9c137a39319f8fb0a417d5438540b9bae sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf sha512sums = d1eb35e93c317a5d0b764cf3a6c183f17f9fadd9a9295dc36f0b9482b89fa6f2aba2b3011b2f3166282a7e3b2ed10f68ec824cb647f2e119ce014d31ba987d8d - sha512sums = ca19baa5299ef35997473a6dcd3f89c9b2693afabf32b5f9dce2b6527bf9d9b9060c4b59a747a49631c81a117257fd2376eb3bb33f90bb56e9db0577abe5d4bd pkgname = linux-uksm pkgdesc = Linux Kernel and modules with the UKSM. diff --git a/0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch b/0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch deleted file mode 100644 index c9f4a3a3a347..000000000000 --- a/0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 62530ed8b1d07a45dec94d46e521c0c6c2d476e6 Mon Sep 17 00:00:00 2001 -Message-Id: <62530ed8b1d07a45dec94d46e521c0c6c2d476e6.1511339979.git.jan.steffens@gmail.com> -From: Michael Lyle <mlyle@lyle.org> -Date: Thu, 16 Nov 2017 23:47:25 -0800 -Subject: [PATCH] bio: ensure __bio_clone_fast copies bi_partno - -A new field was introduced in 74d46992e0d9, bi_partno, instead of using -bdev->bd_contains and encoding the partition information in the bi_bdev -field. __bio_clone_fast was changed to copy the disk information, but -not the partition information. At minimum, this regressed bcache and -caused data corruption. - -Signed-off-by: Michael Lyle <mlyle@lyle.org> -Fixes: 74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index") -Reported-by: Pavel Goran <via-bcache@pvgoran.name> -Reported-by: Campbell Steven <casteven@gmail.com> -Reviewed-by: Coly Li <colyli@suse.de> -Reviewed-by: Ming Lei <ming.lei@redhat.com> -Cc: <stable@vger.kernel.org> # 4.14 -Signed-off-by: Jens Axboe <axboe@kernel.dk> ---- - block/bio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/block/bio.c b/block/bio.c -index b94a802f8ba34189..459cc857f3d91647 100644 ---- a/block/bio.c -+++ b/block/bio.c -@@ -597,6 +597,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src) - * so we don't set nor calculate new physical/hw segment counts here - */ - bio->bi_disk = bio_src->bi_disk; -+ bio->bi_partno = bio_src->bi_partno; - bio_set_flag(bio, BIO_CLONED); - bio->bi_opf = bio_src->bi_opf; - bio->bi_write_hint = bio_src->bi_write_hint; --- -2.15.0 - @@ -51,7 +51,7 @@ _use_current= pkgbase=linux-uksm # pkgname=('linux-uksm' 'linux-uksm-headers' 'linux-uksm-docs') _srcname=linux-4.14 -pkgver=4.14.1 +pkgver=4.14.2 pkgrel=1 arch=('x86_64') url="https://github.com/dolohow/uksm" @@ -79,8 +79,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" '99-linux.hook' # standard config files for mkinitcpio ramdisk 'linux.preset' - '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch' - '0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch') + '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch') _kernelname=${pkgbase#linux} @@ -94,11 +93,7 @@ prepare() { ### Fix https://bugs.archlinux.org/task/56207 msg "Fix bug #56207" patch -Np1 -i ../0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch - - ### Fix https://bugs.archlinux.org/task/56404 - msg "Fix bug #56404" - patch -Np1 -i ../0001-bio-ensure-__bio_clone_fast-copies-bi_partno.patch - + ### Patch source with UKSM msg "Patching source with UKSM" patch -Np1 -i ../${_uksm_patch} @@ -361,7 +356,7 @@ done sha512sums=('77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8' 'SKIP' - '2566d2151cb0e0ad706dda3cb815e293d84ecc804cf2891e511a0f28e359b7714a1732add599a268c98108a63ee40200cf76cbda8181d67d0a64511e815202df' + '04415954c3c4d3044a6a3da979e59fb18f0eda3fd872a8036ac8947fbbadcd6041384a900973b917353de6e5c1a589eff1db63c029edcb78f38b07868a929f9d' 'SKIP' '5ca7ae20245a54caa71fb570d971d6872d4e888f35c6123b93fbca16baf9a0e2500d6ec931f3906e4faecaaca9cad0d593694d9cab617efd0cb7b5fc09c0fa48' '44b31276d4d712e4e1e1455e128daa079ddd9d72a4620289607faf6134a225737004e8742de79e0283e98ef2d4f746f075e041870d37eab191c93c566f945c7f' @@ -370,8 +365,7 @@ sha512sums=('77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' 'dc2b69f1463756ce0a7906e9ebedfb227eb4386f889a78932924ef1f576c9e02ad19e2d2510db0b864310e1d92fc3be9c137a39319f8fb0a417d5438540b9bae' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - 'd1eb35e93c317a5d0b764cf3a6c183f17f9fadd9a9295dc36f0b9482b89fa6f2aba2b3011b2f3166282a7e3b2ed10f68ec824cb647f2e119ce014d31ba987d8d' - 'ca19baa5299ef35997473a6dcd3f89c9b2693afabf32b5f9dce2b6527bf9d9b9060c4b59a747a49631c81a117257fd2376eb3bb33f90bb56e9db0577abe5d4bd') + 'd1eb35e93c317a5d0b764cf3a6c183f17f9fadd9a9295dc36f0b9482b89fa6f2aba2b3011b2f3166282a7e3b2ed10f68ec824cb647f2e119ce014d31ba987d8d') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds |