From f46fc95f8145b7ca45de4426aeaad043c2863977 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Sun, 14 Apr 2024 23:26:55 +0200 Subject: kernel 6.8.6 --- SOURCES/Patchlist.changelog | 10 ++++++++-- SOURCES/kernel.changelog | 7 +++++++ SOURCES/patch-6.8-redhat.patch | 29 ++++++++++++++++++++++------- SPECS/kernel.spec | 20 +++++++++++++------- 4 files changed, 50 insertions(+), 16 deletions(-) diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index 1712cfc..0e3b693 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,5 +1,11 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/17c279233795edf80d29431dc144c7ac0bdbabf3 - 17c279233795edf80d29431dc144c7ac0bdbabf3 Revert "cpupower: Bump soname version" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/429ecd1add008c0f027e68eb958276b2dc60417f + 429ecd1add008c0f027e68eb958276b2dc60417f Revert "cpupower: Bump soname version" + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/e56840b5f971b4d0f4032f6f5ab95c0c5ba40f8e + e56840b5f971b4d0f4032f6f5ab95c0c5ba40f8e nouveau: fix devinit paths to only handle display on GSP. + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/252ea3336f8ee7551675d82e1899125aa6e730b6 + 252ea3336f8ee7551675d82e1899125aa6e730b6 Bluetooth: l2cap: Don't double set the HCI_CONN_MGMT_CONNECTED bit "https://gitlab.com/cki-project/kernel-ark/-/commit"/9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index b3dcaae..236a866 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,10 @@ +* Sat Apr 13 2024 Justin M. Forbes [6.8.6-0] +- nouveau: fix devinit paths to only handle display on GSP. (Dave Airlie) +- Add bluetooth bug to Bugsfixed for 6.8.6 (Justin M. Forbes) +- Bluetooth: l2cap: Don't double set the HCI_CONN_MGMT_CONNECTED bit (Archie Pusaka) +- Linux v6.8.6 +Resolves: + * Wed Apr 10 2024 Justin M. Forbes [6.8.5-0] - Set configs for SPECTRE_BHI (Justin M. Forbes) - Add AMD PMF bug (Justin M. Forbes) diff --git a/SOURCES/patch-6.8-redhat.patch b/SOURCES/patch-6.8-redhat.patch index 6056744..64246c0 100644 --- a/SOURCES/patch-6.8-redhat.patch +++ b/SOURCES/patch-6.8-redhat.patch @@ -29,6 +29,7 @@ include/linux/security.h | 5 + kernel/module/main.c | 2 + kernel/module/signing.c | 9 +- + net/bluetooth/l2cap_core.c | 3 +- scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- @@ -36,10 +37,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ tools/power/cpupower/Makefile | 2 +- - 38 files changed, 672 insertions(+), 178 deletions(-) + 39 files changed, 673 insertions(+), 180 deletions(-) diff --git a/Makefile b/Makefile -index f29a75b75861..90586379d1e8 100644 +index c426d47f4b7b..9e0540aa3691 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -733,7 +734,7 @@ index 2e2cabc5f50a..8b44d990f978 100644 platform_driver_unregister(&etm4_platform_driver); etm4_pm_clear(); diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c -index 42eaebb3bf5c..7a35119c3144 100644 +index ef9ea295f9e0..0103334e8f32 100644 --- a/drivers/input/rmi4/rmi_driver.c +++ b/drivers/input/rmi4/rmi_driver.c @@ -182,34 +182,47 @@ void rmi_set_attn_data(struct rmi_device *rmi_dev, unsigned long irq_status, @@ -905,7 +906,7 @@ index 42eaebb3bf5c..7a35119c3144 100644 rmi_f34_remove_sysfs(rmi_dev); rmi_free_function_list(rmi_dev); -@@ -1219,9 +1237,15 @@ static int rmi_driver_probe(struct device *dev) +@@ -1223,9 +1241,15 @@ static int rmi_driver_probe(struct device *dev) } } @@ -1416,8 +1417,22 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) +diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c +index ab5a9d42fae7..706d2478ddb3 100644 +--- a/net/bluetooth/l2cap_core.c ++++ b/net/bluetooth/l2cap_core.c +@@ -4054,8 +4054,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn, + return -EPROTO; + + hci_dev_lock(hdev); +- if (hci_dev_test_flag(hdev, HCI_MGMT) && +- !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags)) ++ if (hci_dev_test_flag(hdev, HCI_MGMT)) + mgmt_device_connected(hdev, hcon, NULL, 0); + hci_dev_unlock(hdev); + diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 6568f8177e39..14d8237af366 100644 +index ce686ebf5591..0d28efddb253 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -1428,7 +1443,7 @@ index 6568f8177e39..14d8237af366 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1995,6 +1996,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1997,6 +1998,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -1441,7 +1456,7 @@ index 6568f8177e39..14d8237af366 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2055,6 +2062,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2057,6 +2064,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index a0307c9..33f68e5 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specrpmversion 6.8.5 -%define specversion 6.8.5 +%define specrpmversion 6.8.6 +%define specversion 6.8.6 %define patchversion 6.8 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.8.5 +%define tarfile_release 6.8.6 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.5 +%define kabiversion 6.8.6 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4100,13 +4100,19 @@ fi\ # # %changelog -* Thu Apr 11 2024 Jan200101 - 6.8.5-201.fsync -- kernel-fsync v6.8.5 +* Sun Apr 14 2024 Jan200101 - 6.8.6-201.fsync +- kernel-fsync v6.8.6 -* Wed Apr 10 2024 Justin M. Forbes [6.8.5-200] +* Sat Apr 13 2024 Justin M. Forbes [6.8.6-200] - Revert "cpupower: Bump soname version" (Justin M. Forbes) - Drop soname for libcpupower.so since we reverted the bump (Justin M. Forbes) +* Sat Apr 13 2024 Justin M. Forbes [6.8.6-0] +- nouveau: fix devinit paths to only handle display on GSP. (Dave Airlie) +- Add bluetooth bug to Bugsfixed for 6.8.6 (Justin M. Forbes) +- Bluetooth: l2cap: Don't double set the HCI_CONN_MGMT_CONNECTED bit (Archie Pusaka) +- Linux v6.8.6 + * Wed Apr 10 2024 Justin M. Forbes [6.8.5-0] - Set configs for SPECTRE_BHI (Justin M. Forbes) - Add AMD PMF bug (Justin M. Forbes) -- cgit v1.2.3