Update to 6.4.5-1

8 files changed, 16 insertions, 190 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2adbdb045dfd..43d664c6d60c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 6.4.4
+	pkgver = 6.4.5
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -15,30 +15,22 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.4.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.4.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.5.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.5.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-tpm-tpm_tis-Disable-interrupts-only-for-AEON-UPX-i11.patch
-	source = 0003-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
-	source = 0004-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
-	source = 0005-tpm-tpm_tis-Disable-interrupts-for-Lenovo-L590-devic.patch
-	source = 0006-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
+	source = 0002-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 9cbc4a2be714a4d154e1312c9f33ded91174907c8b15ee936ad27002ac75ff2a
+	sha256sums = 374e2c07463c51dfd71204b7fac3b73c7f973550ae019b74e9f2b815b28de9b7
 	sha256sums = SKIP
 	sha256sums = f9b4320b074f279d666e86870f950bcea68f9f1912093626036410b8b3152a6d
 	sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0
 	sha256sums = ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144
-	sha256sums = 7aa21d16b39bb23ba5164687245dd3cd3c32cebba5eeaa1efc7a03b82ec8f1f7
-	sha256sums = 69c1e30697c6dc9a5dcb7f3340ef388404df31b888300c6bfea3ac167f2e4ddf
-	sha256sums = 30197c03b689b91cacce6e798fd53a3882f0dd4d1610a0e174f667b19e211385
-	sha256sums = 0530d1d5dedd7870eadf54512ccd0564cd078183d019c04d69b269767205352a
-	sha256sums = f9af45420254db5f8aac3c399b3a59e34c94625fbf3b3a29330c04a5ce9d837b
-	sha256sums = 6fc3a4f7ce5b049da9f13b85cd00070a83e0ec036c8a43304c1b1e1882567e8c
+	sha256sums = 123e9bdc5e28f9cac322c271cf0edd010036d2b2b1fdaba8adecf1be7ed1eb72
+	sha256sums = 924d022fb47781873312494674c571d30a64d810590e9cbef6f32fc60eaba4c6
 
 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 194e1c105b66..6be38bbe122a 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 63373079bd756247f2ea9e3b22baef0b67cfb7dd Mon Sep 17 00:00:00 2001
+From 0ae15203e67e6a8d3f76fb05caafdc3e90968e4c 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/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
diff --git a/0006-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch b/0002-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
index 6e0689d851ec..63314c66dc4d 100644
--- a/0006-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
+++ b/0002-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
@@ -1,7 +1,7 @@
-From 5718acc67b7101c5c5d834b4699b58710f619171 Mon Sep 17 00:00:00 2001
+From 4dce89f964f32b17bd8c500c6d904e757395e55c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Tomasz=20Mo=C5=84?= <tomasz.mon@nordicsemi.no>
 Date: Thu, 13 Jul 2023 12:25:14 +0200
-Subject: [PATCH 6/7] Bluetooth: btusb: Fix bluetooth on Intel Macbook 2014
+Subject: [PATCH 2/3] Bluetooth: btusb: Fix bluetooth on Intel Macbook 2014
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
diff --git a/0002-tpm-tpm_tis-Disable-interrupts-only-for-AEON-UPX-i11.patch b/0002-tpm-tpm_tis-Disable-interrupts-only-for-AEON-UPX-i11.patch
deleted file mode 100644
index deedda3e705c..000000000000
--- a/0002-tpm-tpm_tis-Disable-interrupts-only-for-AEON-UPX-i11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 069e524939a815a637e923d4063e4b0e0f52ea13 Mon Sep 17 00:00:00 2001
-From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Date: Wed, 17 May 2023 15:29:31 +0300
-Subject: [PATCH 2/7] tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11
-
-Further restrict with DMI_PRODUCT_VERSION.
-
-Cc: stable@vger.kernel.org # v6.4+
-Link: https://lore.kernel.org/linux-integrity/20230517122931.22385-1-peter.ujfalusi@linux.intel.com/
-Fixes: 95a9359ee22f ("tpm: tpm_tis: Disable interrupts for AEON UPX-i11")
-Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
-Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
-Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
----
- drivers/char/tpm/tpm_tis.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
-index 7db3593941ea..9cb4e81fc548 100644
---- a/drivers/char/tpm/tpm_tis.c
-+++ b/drivers/char/tpm/tpm_tis.c
-@@ -143,6 +143,7 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
- 		.ident = "UPX-TGL",
- 		.matches = {
- 			DMI_MATCH(DMI_SYS_VENDOR, "AAEON"),
-+			DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL"),
- 		},
- 	},
- 	{}
--- 
-2.41.0
-
diff --git a/0003-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch b/0003-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
deleted file mode 100644
index f9be8ab5cceb..000000000000
--- a/0003-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 530ad4f3240a3b6e448bd301cc632e7c44cac9b2 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Mon, 10 Jul 2023 23:16:09 +0200
-Subject: [PATCH 3/7] tpm/tpm_tis: Disable interrupts for Framework Laptop
- Intel 12th gen
-
-This device suffer an irq storm, so add it in tpm_tis_dmi_table to
-force polling.
-
-Cc: stable@vger.kernel.org # v6.4+
-Link: https://community.frame.work/t/boot-and-shutdown-hangs-with-arch-linux-kernel-6-4-1-mainline-and-arch/33118
-Fixes: e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
-Reported-by: <roubro1991@gmail.com>
-Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217631
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
----
- drivers/char/tpm/tpm_tis.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
-index 9cb4e81fc548..5dd391ed3320 100644
---- a/drivers/char/tpm/tpm_tis.c
-+++ b/drivers/char/tpm/tpm_tis.c
-@@ -114,6 +114,14 @@ static int tpm_tis_disable_irq(const struct dmi_system_id *d)
- }
- 
- static const struct dmi_system_id tpm_tis_dmi_table[] = {
-+	{
-+		.callback = tpm_tis_disable_irq,
-+		.ident = "Framework Laptop (12th Gen Intel Core)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "Framework"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (12th Gen Intel Core)"),
-+		},
-+	},
- 	{
- 		.callback = tpm_tis_disable_irq,
- 		.ident = "ThinkPad T490s",
--- 
-2.41.0
-
diff --git a/0004-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch b/0004-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
deleted file mode 100644
index 7c9479a1fec4..000000000000
--- a/0004-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 07c0bd0d251db0ac13064f46534a22e070a9379f Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Mon, 10 Jul 2023 23:16:10 +0200
-Subject: [PATCH 4/7] tpm/tpm_tis: Disable interrupts for Framework Laptop
- Intel 13th gen
-
-This device suffer an irq storm, so add it in tpm_tis_dmi_table to
-force polling.
-
-Cc: stable@vger.kernel.org # v6.4+
-Link: https://community.frame.work/t/boot-and-shutdown-hangs-with-arch-linux-kernel-6-4-1-mainline-and-arch/33118
-Fixes: e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
-Reported-by: <roubro1991@gmail.com>
-Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217631
-Signed-off-by: Christian Hesse <mail@eworm.de>
-Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
----
- drivers/char/tpm/tpm_tis.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
-index 5dd391ed3320..4e4426965cd0 100644
---- a/drivers/char/tpm/tpm_tis.c
-+++ b/drivers/char/tpm/tpm_tis.c
-@@ -122,6 +122,14 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
- 			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (12th Gen Intel Core)"),
- 		},
- 	},
-+	{
-+		.callback = tpm_tis_disable_irq,
-+		.ident = "Framework Laptop (13th Gen Intel Core)",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "Framework"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),
-+		},
-+	},
- 	{
- 		.callback = tpm_tis_disable_irq,
- 		.ident = "ThinkPad T490s",
--- 
-2.41.0
-
diff --git a/0005-tpm-tpm_tis-Disable-interrupts-for-Lenovo-L590-devic.patch b/0005-tpm-tpm_tis-Disable-interrupts-for-Lenovo-L590-devic.patch
deleted file mode 100644
index 2f7853009c73..000000000000
--- a/0005-tpm-tpm_tis-Disable-interrupts-for-Lenovo-L590-devic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4abd126fb6e7ed77ee5a286132a5afc133dd24bc Mon Sep 17 00:00:00 2001
-From: Florian Bezdeka <florian@bezdeka.de>
-Date: Tue, 20 Jun 2023 13:11:01 +0200
-Subject: [PATCH 5/7] tpm/tpm_tis: Disable interrupts for Lenovo L590 devices
-
-The Lenovo L590 suffers from an irq storm issue like the T490, T490s
-and P360 Tiny, so add an entry for it to tpm_tis_dmi_table and force
-polling.
-
-Cc: stable@vger.kernel.org # v6.4+
-Link: https://bugzilla.redhat.com/show_bug.cgi?id=2214069#c0
-Fixes: e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test")
-Signed-off-by: Florian Bezdeka <florian@bezdeka.de>
-Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
----
- drivers/char/tpm/tpm_tis.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
-index 4e4426965cd0..cc42cf3de960 100644
---- a/drivers/char/tpm/tpm_tis.c
-+++ b/drivers/char/tpm/tpm_tis.c
-@@ -154,6 +154,14 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = {
- 			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L490"),
- 		},
- 	},
-+	{
-+		.callback = tpm_tis_disable_irq,
-+		.ident = "ThinkPad L590",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-+			DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L590"),
-+		},
-+	},
- 	{
- 		.callback = tpm_tis_disable_irq,
- 		.ident = "UPX-TGL",
--- 
-2.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index a63aaa106267..08fad2ffa66b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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.4
+pkgver=6.4.5
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -103,27 +103,19 @@ source=(
   "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
   "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-tpm-tpm_tis-Disable-interrupts-only-for-AEON-UPX-i11.patch
-  0003-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
-  0004-tpm-tpm_tis-Disable-interrupts-for-Framework-Laptop-.patch
-  0005-tpm-tpm_tis-Disable-interrupts-for-Lenovo-L590-devic.patch
-  0006-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
+  0002-Bluetooth-btusb-Fix-bluetooth-on-Intel-Macbook-2014.patch
 )
 validpgpkeys=(
   ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
   647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
 )
-sha256sums=('9cbc4a2be714a4d154e1312c9f33ded91174907c8b15ee936ad27002ac75ff2a'
+sha256sums=('374e2c07463c51dfd71204b7fac3b73c7f973550ae019b74e9f2b815b28de9b7'
             'SKIP'
             'f9b4320b074f279d666e86870f950bcea68f9f1912093626036410b8b3152a6d'
             'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0'
             'ed0b8773d66079198edd1ecdbe0564d6ad33c641e82d85375e50a2d9e0275144'
-            '7aa21d16b39bb23ba5164687245dd3cd3c32cebba5eeaa1efc7a03b82ec8f1f7'
-            '69c1e30697c6dc9a5dcb7f3340ef388404df31b888300c6bfea3ac167f2e4ddf'
-            '30197c03b689b91cacce6e798fd53a3882f0dd4d1610a0e174f667b19e211385'
-            '0530d1d5dedd7870eadf54512ccd0564cd078183d019c04d69b269767205352a'
-            'f9af45420254db5f8aac3c399b3a59e34c94625fbf3b3a29330c04a5ce9d837b'
-            '6fc3a4f7ce5b049da9f13b85cd00070a83e0ec036c8a43304c1b1e1882567e8c')
+            '123e9bdc5e28f9cac322c271cf0edd010036d2b2b1fdaba8adecf1be7ed1eb72'
+            '924d022fb47781873312494674c571d30a64d810590e9cbef6f32fc60eaba4c6')
 _make() {
   test -s version
   make KERNELRELEASE="$(<version)" "$@"