diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 6 | ||||
-rw-r--r-- | 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch | 6 | ||||
-rw-r--r-- | 0003-tpm-Don-t-make-vendor-check-required-for-probe.patch | 39 | ||||
-rw-r--r-- | 0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch | 33 | ||||
-rw-r--r-- | PKGBUILD | 12 |
6 files changed, 96 insertions, 16 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-ck - pkgver = 6.4.11 + pkgver = 6.4.12 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -15,22 +15,26 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.11.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.11.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.12.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.12.tar.sign source = config source = more-uarches-20221217.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221217.tar.gz source = ck-hrtimer-2870d6ac146aa658af60bb18a9c7503efe5992d4.tar.gz::https://github.com/graysky2/linux-patches/archive/2870d6ac146aa658af60bb18a9c7503efe5992d4.tar.gz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch + source = 0003-tpm-Don-t-make-vendor-check-required-for-probe.patch + source = 0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 546b68b5097d3c0d74722de62aae217729d98e45fbb6bd458b490ac21ea40918 + sha256sums = cca91be956fe081f8f6da72034cded96fe35a50be4bfb7e103e354aa2159a674 sha256sums = SKIP sha256sums = dad89a5db7c4e19ae29c60861000f3669e86c2e957d445a675596c1e85a57464 sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0 sha256sums = ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144 - sha256sums = 58d09bed6204c41bdc2220740a90e974b999e779da9b8f2dd5a049247f193327 - sha256sums = 63ba7146381b0117bc3b5813c6df6374e68307e089dd81aad769993e5af95983 + sha256sums = 26932226873903df3e4c330581b0112e4817ecb55c60bebc969f8aeba440a7f7 + sha256sums = ca8e9ae6b10b394f71314dcbc381832d5c2ab654aa1c4bd24a25a0ba3588c3a3 + sha256sums = 83dec929306e9dc54d8f786866a478ee530912ba722479d6dbfb099d5023a7cb + sha256sums = 65b6e434abc21c29a33a4d73dee40d33679f04ee740ded8fe88c320d1248055c pkgname = linux-ck pkgdesc = The Linux kernel and modules with ck's hrtimer patches diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 279c0057fc25..614a5993db89 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From 8d210c9529a46d6cd07027286714805b7c7e0c30 Mon Sep 17 00:00:00 2001 +From 093ed5b87ed2e51249857480db29b82d5e067dfd Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/5] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. @@ -150,5 +150,5 @@ index 1d8e47bed3f1..fec01d016a35 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.41.0 +2.42.0 diff --git a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch index 77e56de559ad..e2b49f15fef6 100644 --- a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch +++ b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch @@ -1,7 +1,7 @@ -From e65a5fe09577d17e2fded61067f759f2bf02f6c0 Mon Sep 17 00:00:00 2001 +From 3720e1b0eb7d814345b25541997e63b50b897749 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas <javierm@redhat.com> Date: Thu, 19 May 2022 14:40:07 +0200 -Subject: [PATCH 2/3] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 +Subject: [PATCH 2/5] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set The Nvidia proprietary driver has some bugs that leads to issues if used @@ -86,5 +86,5 @@ index 3c197db42c9d..16e4a2e90fae 100644 if (!IS_ERR(pd)) goto unlock_mutex; -- -2.41.0 +2.42.0 diff --git a/0003-tpm-Don-t-make-vendor-check-required-for-probe.patch b/0003-tpm-Don-t-make-vendor-check-required-for-probe.patch new file mode 100644 index 000000000000..92270a69f304 --- /dev/null +++ b/0003-tpm-Don-t-make-vendor-check-required-for-probe.patch @@ -0,0 +1,39 @@ +From e5f6f3e36b5e3a3bae8d890f70d3508edc4049be Mon Sep 17 00:00:00 2001 +From: Mario Limonciello <mario.limonciello@amd.com> +Date: Fri, 18 Aug 2023 13:15:16 -0500 +Subject: [PATCH 3/5] tpm: Don't make vendor check required for probe + +The vendor check introduced by commit 554b841d4703 ("tpm: Disable RNG for +all AMD fTPMs") doesn't work properly on Intel fTPM. The TPM doesn't reply +at bootup and returns back the command code. + +As this isn't crucial for anything but AMD fTPM and AMD fTPM works, throw +away the error code to let Intel fTPM continue to work. + +Cc: stable@vger.kernel.org +Fixes: 554b841d4703 ("tpm: Disable RNG for all AMD fTPMs") +Reported-by: Todd Brandt <todd.e.brandt@intel.com> +Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217804 +Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> +Cherry-picked-for: https://bugs.archlinux.org/task/79366 +--- + drivers/char/tpm/tpm_crb.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c +index 9eb1a1859012..b0e9931fe436 100644 +--- a/drivers/char/tpm/tpm_crb.c ++++ b/drivers/char/tpm/tpm_crb.c +@@ -472,8 +472,7 @@ static int crb_check_flags(struct tpm_chip *chip) + if (ret) + return ret; + +- ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL); +- if (ret) ++ if (tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL)) + goto release; + + if (val == 0x414D4400U /* AMD */) +-- +2.42.0 + diff --git a/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch b/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch new file mode 100644 index 000000000000..0f9d562584be --- /dev/null +++ b/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch @@ -0,0 +1,33 @@ +From 879f0f7fc0f9130075d722c213014d0cff9d40a1 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> +Date: Thu, 24 Aug 2023 01:28:17 +0200 +Subject: [PATCH 4/5] sphinx: kfigure.py: Convert outdir to str before using + len + +Sphinx 7.2 replaced several uses of str with pathlib Paths, causing the +build to fail with a TypeError when attempting to use len on one. + +Patch by @loqs; thanks. + +Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +Fixes: https://bugs.archlinux.org/task/79446 +--- + Documentation/sphinx/kfigure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/sphinx/kfigure.py b/Documentation/sphinx/kfigure.py +index cefdbb7e7523..13e885bbd499 100644 +--- a/Documentation/sphinx/kfigure.py ++++ b/Documentation/sphinx/kfigure.py +@@ -309,7 +309,7 @@ def convert_image(img_node, translator, src_fname=None): + if dst_fname: + # the builder needs not to copy one more time, so pop it if exists. + translator.builder.images.pop(img_node['uri'], None) +- _name = dst_fname[len(translator.builder.outdir) + 1:] ++ _name = dst_fname[len(str(translator.builder.outdir)) + 1:] + + if isNewer(dst_fname, src_fname): + kernellog.verbose(app, +-- +2.42.0 + @@ -71,7 +71,7 @@ _subarch= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=6.4.11 +pkgver=6.4.12 pkgrel=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -104,18 +104,22 @@ source=( "ck-hrtimer-$_commit.tar.gz::https://github.com/graysky2/linux-patches/archive/$_commit.tar.gz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch + 0003-tpm-Don-t-make-vendor-check-required-for-probe.patch + 0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch ) validpgpkeys=( ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman ) -sha256sums=('546b68b5097d3c0d74722de62aae217729d98e45fbb6bd458b490ac21ea40918' +sha256sums=('cca91be956fe081f8f6da72034cded96fe35a50be4bfb7e103e354aa2159a674' 'SKIP' 'dad89a5db7c4e19ae29c60861000f3669e86c2e957d445a675596c1e85a57464' 'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0' 'ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144' - '58d09bed6204c41bdc2220740a90e974b999e779da9b8f2dd5a049247f193327' - '63ba7146381b0117bc3b5813c6df6374e68307e089dd81aad769993e5af95983') + '26932226873903df3e4c330581b0112e4817ecb55c60bebc969f8aeba440a7f7' + 'ca8e9ae6b10b394f71314dcbc381832d5c2ab654aa1c4bd24a25a0ba3588c3a3' + '83dec929306e9dc54d8f786866a478ee530912ba722479d6dbfb099d5023a7cb' + '65b6e434abc21c29a33a4d73dee40d33679f04ee740ded8fe88c320d1248055c') _make() { test -s version make KERNELRELEASE="$(<version)" "$@" |