From e54b1e7dfd090479c21372dad3f4917d1a1dfa89 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sun, 17 Nov 2024 15:30:31 +0100 Subject: [PATCH] 6.11: Sync Signed-off-by: Peter Jung --- 6.11/0001-address-masking.patch | 4 +- 6.11/0002-amd-cache-optimizer.patch | 4 +- 6.11/0003-amd-pstate.patch | 4 +- 6.11/0004-bbr3.patch | 4 +- 6.11/0005-cachy.patch | 6 +-- 6.11/0006-fixes.patch | 4 +- 6.11/0007-intel-pstate.patch | 4 +- 6.11/0008-ksm.patch | 4 +- 6.11/0009-ntsync.patch | 4 +- 6.11/0010-perf-per-core.patch | 4 +- 6.11/0011-t2.patch | 8 ++-- 6.11/0012-thp-shrinker.patch | 4 +- 6.11/0013-zstd.patch | 4 +- 6.11/all/0001-cachyos-base-all.patch | 58 ++++++++++++++-------------- 14 files changed, 58 insertions(+), 58 deletions(-) diff --git a/6.11/0001-address-masking.patch b/6.11/0001-address-masking.patch index 397f34bc..54cebf17 100644 --- a/6.11/0001-address-masking.patch +++ b/6.11/0001-address-masking.patch @@ -1,6 +1,6 @@ -From e2e1bb55424f35d93c9110d4f1f1787999f1cd34 Mon Sep 17 00:00:00 2001 +From 8a8f42b2df5e87dfb1309dc32efe064d6447498c Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:53:48 +0100 +Date: Sun, 17 Nov 2024 15:21:02 +0100 Subject: [PATCH 01/13] address-masking Signed-off-by: Peter Jung diff --git a/6.11/0002-amd-cache-optimizer.patch b/6.11/0002-amd-cache-optimizer.patch index 14f055bf..53710983 100644 --- a/6.11/0002-amd-cache-optimizer.patch +++ b/6.11/0002-amd-cache-optimizer.patch @@ -1,6 +1,6 @@ -From af2c10989d40a789c13a4cea89174587a6c85cc6 Mon Sep 17 00:00:00 2001 +From 98cdd185fb417efe7cef1cbdc3d862af9556d9da Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:54:07 +0100 +Date: Sun, 17 Nov 2024 15:21:16 +0100 Subject: [PATCH 02/13] amd-cache-optimizer Signed-off-by: Peter Jung diff --git a/6.11/0003-amd-pstate.patch b/6.11/0003-amd-pstate.patch index 5e3ac36b..cd4939c9 100644 --- a/6.11/0003-amd-pstate.patch +++ b/6.11/0003-amd-pstate.patch @@ -1,6 +1,6 @@ -From ee21687468f304e9fbf16b13d4dbf54684a42928 Mon Sep 17 00:00:00 2001 +From ad8eaef6041b4a1c1d6090ad009b54c4c00f8f40 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:54:24 +0100 +Date: Sun, 17 Nov 2024 15:21:31 +0100 Subject: [PATCH 03/13] amd-pstate Signed-off-by: Peter Jung diff --git a/6.11/0004-bbr3.patch b/6.11/0004-bbr3.patch index a0ea7f2e..de00e143 100644 --- a/6.11/0004-bbr3.patch +++ b/6.11/0004-bbr3.patch @@ -1,6 +1,6 @@ -From 0da4917ae42888bccbf6fabd6102d994d34262da Mon Sep 17 00:00:00 2001 +From 98ed56d9bb29f55741b90c8604d18ca87e61f202 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:55:11 +0100 +Date: Sun, 17 Nov 2024 15:21:47 +0100 Subject: [PATCH 04/13] bbr3 Signed-off-by: Peter Jung diff --git a/6.11/0005-cachy.patch b/6.11/0005-cachy.patch index 18f8cd6a..397f6a73 100644 --- a/6.11/0005-cachy.patch +++ b/6.11/0005-cachy.patch @@ -1,6 +1,6 @@ -From 70a49c61f77983ee2e92bfd25e18386fc982d158 Mon Sep 17 00:00:00 2001 +From faa622f12b400a19f930f463f635c6d2da6bef35 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:56:22 +0100 +Date: Sun, 17 Nov 2024 15:22:00 +0100 Subject: [PATCH 05/13] cachy Signed-off-by: Peter Jung @@ -97,7 +97,7 @@ index be010fec7654..900113802ffc 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/Makefile b/Makefile -index b8641dde171f..b6d641c53e15 100644 +index 3e48c8d84540..fbc61cdf215b 100644 --- a/Makefile +++ b/Makefile @@ -803,11 +803,19 @@ KBUILD_CFLAGS += -fno-delete-null-pointer-checks diff --git a/6.11/0006-fixes.patch b/6.11/0006-fixes.patch index c27623eb..6e4cb353 100644 --- a/6.11/0006-fixes.patch +++ b/6.11/0006-fixes.patch @@ -1,6 +1,6 @@ -From 2cee36cd0b5c8545ff7c8993cfeb5a8765f3143c Mon Sep 17 00:00:00 2001 +From 7c86fcea74e34fcfd9c4d51307db8bb97777b2b3 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:04:45 +0100 +Date: Sun, 17 Nov 2024 15:22:59 +0100 Subject: [PATCH 06/13] fixes Signed-off-by: Peter Jung diff --git a/6.11/0007-intel-pstate.patch b/6.11/0007-intel-pstate.patch index 7211cb66..c7a766af 100644 --- a/6.11/0007-intel-pstate.patch +++ b/6.11/0007-intel-pstate.patch @@ -1,6 +1,6 @@ -From aaf8a7e89d3582be8c14392fc4fe8c4cbd416ae2 Mon Sep 17 00:00:00 2001 +From f053ac26181cc3093028a58c9e157db61948afd8 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:00:14 +0100 +Date: Sun, 17 Nov 2024 15:23:12 +0100 Subject: [PATCH 07/13] intel-pstate Signed-off-by: Peter Jung diff --git a/6.11/0008-ksm.patch b/6.11/0008-ksm.patch index 57887fde..7cff3561 100644 --- a/6.11/0008-ksm.patch +++ b/6.11/0008-ksm.patch @@ -1,6 +1,6 @@ -From f75fb6bf2396dbc37335298fe042fad859df9fa8 Mon Sep 17 00:00:00 2001 +From 17f483c3baf2199664bc4d9884f321638be007a3 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:01:43 +0100 +Date: Sun, 17 Nov 2024 15:23:26 +0100 Subject: [PATCH 08/13] ksm Signed-off-by: Peter Jung diff --git a/6.11/0009-ntsync.patch b/6.11/0009-ntsync.patch index f4f647e5..5f4efd74 100644 --- a/6.11/0009-ntsync.patch +++ b/6.11/0009-ntsync.patch @@ -1,6 +1,6 @@ -From ee5a4d9bc72076794698e6e1da3ef217023f469c Mon Sep 17 00:00:00 2001 +From 158da33c366749b2683ad766f0762766ad7be5a4 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:03:09 +0100 +Date: Sun, 17 Nov 2024 15:23:39 +0100 Subject: [PATCH 09/13] ntsync Signed-off-by: Peter Jung diff --git a/6.11/0010-perf-per-core.patch b/6.11/0010-perf-per-core.patch index 63903a08..eb2ac099 100644 --- a/6.11/0010-perf-per-core.patch +++ b/6.11/0010-perf-per-core.patch @@ -1,6 +1,6 @@ -From 5f6d644590a3af5cc049db4d4b0c74d2ee29b58d Mon Sep 17 00:00:00 2001 +From 128e2bc351909c44fa81d54e766cd5b9993670cd Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:08:15 +0100 +Date: Sun, 17 Nov 2024 15:24:36 +0100 Subject: [PATCH 10/13] perf-per-core Signed-off-by: Peter Jung diff --git a/6.11/0011-t2.patch b/6.11/0011-t2.patch index 519467a0..54868acd 100644 --- a/6.11/0011-t2.patch +++ b/6.11/0011-t2.patch @@ -1,6 +1,6 @@ -From a2687434017f228f18a7159b0b9af7f7ab2ef86a Mon Sep 17 00:00:00 2001 +From cb3933e3e5b2192aec080d4cbf55c98516ede496 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:03:40 +0100 +Date: Sun, 17 Nov 2024 15:25:19 +0100 Subject: [PATCH 11/13] t2 Signed-off-by: Peter Jung @@ -2023,7 +2023,7 @@ index 6e4ebc349e45..4e79fafeeafa 100644 } diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 847462650549..6c4cb3883955 100644 +index 24da73964763..4a393db88992 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -72,6 +72,7 @@ MODULE_LICENSE("GPL"); @@ -2184,7 +2184,7 @@ index 847462650549..6c4cb3883955 100644 if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID) mt_fix_const_fields(hdev, HID_DG_CONTACTID); -@@ -2277,6 +2304,11 @@ static const struct hid_device_id mt_devices[] = { +@@ -2290,6 +2317,11 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, diff --git a/6.11/0012-thp-shrinker.patch b/6.11/0012-thp-shrinker.patch index 34faeded..0eb8d80a 100644 --- a/6.11/0012-thp-shrinker.patch +++ b/6.11/0012-thp-shrinker.patch @@ -1,6 +1,6 @@ -From 31a90f4484502aa2a823c9946337db1d3f19511b Mon Sep 17 00:00:00 2001 +From 9ce17eca3d20f20881b3f509c063a9823d241855 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:04:02 +0100 +Date: Sun, 17 Nov 2024 15:25:41 +0100 Subject: [PATCH 12/13] thp-shrinker Signed-off-by: Peter Jung diff --git a/6.11/0013-zstd.patch b/6.11/0013-zstd.patch index 2a75de12..89faa4dd 100644 --- a/6.11/0013-zstd.patch +++ b/6.11/0013-zstd.patch @@ -1,6 +1,6 @@ -From 12ada7074a5e88b71b4e7fbe5654ef130ead1cff Mon Sep 17 00:00:00 2001 +From d77c996f0662ef4816c398e1224e672c52b2f162 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:04:15 +0100 +Date: Sun, 17 Nov 2024 15:26:34 +0100 Subject: [PATCH 13/13] zstd Signed-off-by: Peter Jung diff --git a/6.11/all/0001-cachyos-base-all.patch b/6.11/all/0001-cachyos-base-all.patch index 8b2a3d16..d22e8cd1 100644 --- a/6.11/all/0001-cachyos-base-all.patch +++ b/6.11/all/0001-cachyos-base-all.patch @@ -1,6 +1,6 @@ -From e2e1bb55424f35d93c9110d4f1f1787999f1cd34 Mon Sep 17 00:00:00 2001 +From 8a8f42b2df5e87dfb1309dc32efe064d6447498c Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:53:48 +0100 +Date: Sun, 17 Nov 2024 15:21:02 +0100 Subject: [PATCH 01/13] address-masking Signed-off-by: Peter Jung @@ -57,9 +57,9 @@ index 39c7cf82b0c2..43844510d5d0 100644 -- 2.47.0 -From af2c10989d40a789c13a4cea89174587a6c85cc6 Mon Sep 17 00:00:00 2001 +From 98cdd185fb417efe7cef1cbdc3d862af9556d9da Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:54:07 +0100 +Date: Sun, 17 Nov 2024 15:21:16 +0100 Subject: [PATCH 02/13] amd-cache-optimizer Signed-off-by: Peter Jung @@ -350,9 +350,9 @@ index 000000000000..679613d02b9a -- 2.47.0 -From ee21687468f304e9fbf16b13d4dbf54684a42928 Mon Sep 17 00:00:00 2001 +From ad8eaef6041b4a1c1d6090ad009b54c4c00f8f40 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:54:24 +0100 +Date: Sun, 17 Nov 2024 15:21:31 +0100 Subject: [PATCH 03/13] amd-pstate Signed-off-by: Peter Jung @@ -1612,9 +1612,9 @@ index dd4682857c12..23698d0f4bb4 100644 -- 2.47.0 -From 0da4917ae42888bccbf6fabd6102d994d34262da Mon Sep 17 00:00:00 2001 +From 98ed56d9bb29f55741b90c8604d18ca87e61f202 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:55:11 +0100 +Date: Sun, 17 Nov 2024 15:21:47 +0100 Subject: [PATCH 04/13] bbr3 Signed-off-by: Peter Jung @@ -4998,9 +4998,9 @@ index 4d40615dc8fc..f27941201ef2 100644 -- 2.47.0 -From 70a49c61f77983ee2e92bfd25e18386fc982d158 Mon Sep 17 00:00:00 2001 +From faa622f12b400a19f930f463f635c6d2da6bef35 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Fri, 8 Nov 2024 16:56:22 +0100 +Date: Sun, 17 Nov 2024 15:22:00 +0100 Subject: [PATCH 05/13] cachy Signed-off-by: Peter Jung @@ -5097,7 +5097,7 @@ index be010fec7654..900113802ffc 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/Makefile b/Makefile -index b8641dde171f..b6d641c53e15 100644 +index 3e48c8d84540..fbc61cdf215b 100644 --- a/Makefile +++ b/Makefile @@ -803,11 +803,19 @@ KBUILD_CFLAGS += -fno-delete-null-pointer-checks @@ -11263,9 +11263,9 @@ index 663ce300dd06..f83493838cf9 100644 -- 2.47.0 -From 2cee36cd0b5c8545ff7c8993cfeb5a8765f3143c Mon Sep 17 00:00:00 2001 +From 7c86fcea74e34fcfd9c4d51307db8bb97777b2b3 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:04:45 +0100 +Date: Sun, 17 Nov 2024 15:22:59 +0100 Subject: [PATCH 06/13] fixes Signed-off-by: Peter Jung @@ -12187,9 +12187,9 @@ index f68a41eeb1fa..6cd386d0fccb 100644 -- 2.47.0 -From aaf8a7e89d3582be8c14392fc4fe8c4cbd416ae2 Mon Sep 17 00:00:00 2001 +From f053ac26181cc3093028a58c9e157db61948afd8 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:00:14 +0100 +Date: Sun, 17 Nov 2024 15:23:12 +0100 Subject: [PATCH 07/13] intel-pstate Signed-off-by: Peter Jung @@ -12671,9 +12671,9 @@ index 348a330678bd..c11be253bfa3 100644 -- 2.47.0 -From f75fb6bf2396dbc37335298fe042fad859df9fa8 Mon Sep 17 00:00:00 2001 +From 17f483c3baf2199664bc4d9884f321638be007a3 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:01:43 +0100 +Date: Sun, 17 Nov 2024 15:23:26 +0100 Subject: [PATCH 08/13] ksm Signed-off-by: Peter Jung @@ -13104,9 +13104,9 @@ index 01071182763e..7394bad8178e 100644 -- 2.47.0 -From ee5a4d9bc72076794698e6e1da3ef217023f469c Mon Sep 17 00:00:00 2001 +From 158da33c366749b2683ad766f0762766ad7be5a4 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:03:09 +0100 +Date: Sun, 17 Nov 2024 15:23:39 +0100 Subject: [PATCH 09/13] ntsync Signed-off-by: Peter Jung @@ -16193,9 +16193,9 @@ index 000000000000..5fa2c9a0768c -- 2.47.0 -From 5f6d644590a3af5cc049db4d4b0c74d2ee29b58d Mon Sep 17 00:00:00 2001 +From 128e2bc351909c44fa81d54e766cd5b9993670cd Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:08:15 +0100 +Date: Sun, 17 Nov 2024 15:24:36 +0100 Subject: [PATCH 10/13] perf-per-core Signed-off-by: Peter Jung @@ -17083,9 +17083,9 @@ index 8277c64f88db..b5a5e1411469 100644 -- 2.47.0 -From a2687434017f228f18a7159b0b9af7f7ab2ef86a Mon Sep 17 00:00:00 2001 +From cb3933e3e5b2192aec080d4cbf55c98516ede496 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:03:40 +0100 +Date: Sun, 17 Nov 2024 15:25:19 +0100 Subject: [PATCH 11/13] t2 Signed-off-by: Peter Jung @@ -19108,7 +19108,7 @@ index 6e4ebc349e45..4e79fafeeafa 100644 } diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c -index 847462650549..6c4cb3883955 100644 +index 24da73964763..4a393db88992 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -72,6 +72,7 @@ MODULE_LICENSE("GPL"); @@ -19269,7 +19269,7 @@ index 847462650549..6c4cb3883955 100644 if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID) mt_fix_const_fields(hdev, HID_DG_CONTACTID); -@@ -2277,6 +2304,11 @@ static const struct hid_device_id mt_devices[] = { +@@ -2290,6 +2317,11 @@ static const struct hid_device_id mt_devices[] = { MT_USB_DEVICE(USB_VENDOR_ID_XIROKU, USB_DEVICE_ID_XIROKU_CSR2) }, @@ -27498,9 +27498,9 @@ index 4427572b2477..b60c99d61882 100755 -- 2.47.0 -From 31a90f4484502aa2a823c9946337db1d3f19511b Mon Sep 17 00:00:00 2001 +From 9ce17eca3d20f20881b3f509c063a9823d241855 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:04:02 +0100 +Date: Sun, 17 Nov 2024 15:25:41 +0100 Subject: [PATCH 12/13] thp-shrinker Signed-off-by: Peter Jung @@ -28314,9 +28314,9 @@ index 9007c420d52c..2eaed8209925 100644 -- 2.47.0 -From 12ada7074a5e88b71b4e7fbe5654ef130ead1cff Mon Sep 17 00:00:00 2001 +From d77c996f0662ef4816c398e1224e672c52b2f162 Mon Sep 17 00:00:00 2001 From: Peter Jung -Date: Thu, 14 Nov 2024 17:04:15 +0100 +Date: Sun, 17 Nov 2024 15:26:34 +0100 Subject: [PATCH 13/13] zstd Signed-off-by: Peter Jung