aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-08-11 08:19:10 -0400
committerPetr Štetiar <ynezz@true.cz>2022-08-11 19:38:10 +0200
commit5238a87c20bc10dd7e87b4d1564e1f5660956fbd (patch)
treea9e26ac6900ea81e0ae29b7f2bc83167393ef873
parentfa9895ee5bae9fa91b18b7a8e06bc63374b0a2a0 (diff)
downloadupstream-5238a87c20bc10dd7e87b4d1564e1f5660956fbd.tar.gz
upstream-5238a87c20bc10dd7e87b4d1564e1f5660956fbd.tar.bz2
upstream-5238a87c20bc10dd7e87b4d1564e1f5660956fbd.zip
kernel: bump 5.15 to 5.15.60
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
-rw-r--r--include/kernel-5.154
-rw-r--r--target/linux/x86/patches-5.15/113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-5.15 b/include/kernel-5.15
index 716bcddf80..962cd0a3ad 100644
--- a/include/kernel-5.15
+++ b/include/kernel-5.15
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .59
-LINUX_KERNEL_HASH-5.15.59 = e6ddc642057340db06b3b921c2b31bfed2c611359e8f144c3e5cf9c3ac33bccb
+LINUX_VERSION-5.15 = .60
+LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a
diff --git a/target/linux/x86/patches-5.15/113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch b/target/linux/x86/patches-5.15/113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch
index 3cff37c918..1be5c62424 100644
--- a/target/linux/x86/patches-5.15/113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch
+++ b/target/linux/x86/patches-5.15/113-v5.21-platform-x86-pmc_atom-Add-Lex-3I380NX-industrial-PC-.patch
@@ -23,7 +23,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
--- a/drivers/platform/x86/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
-@@ -376,19 +376,15 @@
+@@ -376,19 +376,15 @@ static const struct dmi_system_id critcl
},
},
{