From 2ea27e04ee48db3f43809594e6405efa8952de93 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 8 Nov 2023 07:08:34 -0600 Subject: [PATCH] kernel-6.7.0-0.rc0.20231108git305230142ae0.11 * Wed Nov 08 2023 Fedora Kernel Team [6.7.0-0.rc0.305230142ae0.11] - Turn CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514 on for Fedora x86 (Jason Montleon) - kernel/rh_messages.c: Mark functions as possibly unused (Prarit Bhargava) - Add snd-hda-cirrus-scodec-test to mod-internal.list (Scott Weaver) - Linux v6.7.0-0.rc0.305230142ae0 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 +++ kernel.spec | 11 +++++++---- patch-6.7-redhat.patch | 30 +++++++++++++++--------------- sources | 6 +++--- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9ff2043ca..7f148a411 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 10 +RHEL_RELEASE = 11 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 579281fb2..f20d1d190 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/690828965c5831294064da2c7aebe4de7438eab3 + 690828965c5831294064da2c7aebe4de7438eab3 kernel/rh_messages.c: Mark functions as possibly unused + "https://gitlab.com/cki-project/kernel-ark/-/commit"/b1cf24a0ca9448a0dc5bb58b5610094f382f4292 b1cf24a0ca9448a0dc5bb58b5610094f382f4292 crypto: rng - Override drivers/char/random in FIPS mode diff --git a/kernel.spec b/kernel.spec index cd6875e04..8fbccb3d0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc0.20231107gitbe3ca57cfb77.10 +%define pkgrelease 0.rc0.20231108git305230142ae0.11 %define kversion 6 -%define tarfile_release 6.6-15029-gbe3ca57cfb77 +%define tarfile_release 6.6-15365-g305230142ae0 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20231107gitbe3ca57cfb77.10%{?buildid}%{?dist} +%define specrelease 0.rc0.20231108git305230142ae0.11%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3709,8 +3709,11 @@ fi\ # # %changelog -* Tue Nov 07 2023 Justin M. Forbes [6.7.0-0.rc0.20231107gitbe3ca57cfb77.10] +* Wed Nov 08 2023 Fedora Kernel Team [6.7.0-0.rc0.305230142ae0.11] +- Turn CONFIG_SND_SOC_INTEL_AVS_MACH_RT5514 on for Fedora x86 (Jason Montleon) +- kernel/rh_messages.c: Mark functions as possibly unused (Prarit Bhargava) - Add snd-hda-cirrus-scodec-test to mod-internal.list (Scott Weaver) +- Linux v6.7.0-0.rc0.305230142ae0 * Tue Nov 07 2023 Fedora Kernel Team [6.7.0-0.rc0.be3ca57cfb77.10] - Turn off BPF_SYSCALL in pending for zfcpdump (Justin M. Forbes) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index b2140777f..45c125bc7 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -3108,7 +3108,7 @@ index 2807639aab51..914c2b14c184 100644 /** diff --git a/kernel/rh_messages.c b/kernel/rh_messages.c new file mode 100644 -index 000000000000..48a6bb6c9b38 +index 000000000000..bb69e8965748 --- /dev/null +++ b/kernel/rh_messages.c @@ -0,0 +1,414 @@ @@ -3153,7 +3153,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...) ++void __maybe_unused mark_hardware_unmaintained(const char *driver_name, char *fmt, ...) +{ + char device_description[DEV_DESC_LEN]; + va_list args; @@ -3183,7 +3183,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+void mark_hardware_deprecated(const char *driver_name, char *fmt, ...) ++void __maybe_unused mark_hardware_deprecated(const char *driver_name, char *fmt, ...) +{ + char device_description[DEV_DESC_LEN]; + va_list args; @@ -3212,7 +3212,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+static void mark_hardware_disabled(const char *driver_name, char *fmt, ...) ++static void __maybe_unused mark_hardware_disabled(const char *driver_name, char *fmt, ...) +{ + char device_description[DEV_DESC_LEN]; + va_list args; @@ -3233,7 +3233,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+static void pci_hw_deprecated(struct pci_dev *dev) ++static void __maybe_unused pci_hw_deprecated(struct pci_dev *dev) +{ + const struct pci_device_id *ret = pci_match_id(rh_deprecated_pci_devices, dev); + @@ -3271,7 +3271,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+static bool pci_hw_disabled(struct pci_dev *dev) ++static bool __maybe_unused pci_hw_disabled(struct pci_dev *dev) +{ + const struct pci_device_id *ret = pci_match_id(rh_disabled_pci_devices, dev); + @@ -3300,7 +3300,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+static void driver_unmaintained(const char* module_name) ++static void __maybe_unused driver_unmaintained(const char* module_name) +{ + int i = 0; + @@ -3329,7 +3329,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+static void driver_deprecated(const char* module_name) ++static void __maybe_unused driver_deprecated(const char* module_name) +{ + int i = 0; + @@ -3361,7 +3361,7 @@ index 000000000000..48a6bb6c9b38 + * Reserved for Internal Red Hat use only. + */ + -+static void init_fn_unmaintained(char* fn_name) ++static void __maybe_unused init_fn_unmaintained(char* fn_name) +{ + int i = 0; + @@ -3390,7 +3390,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+static void init_fn_deprecated(char* fn_name) ++static void __maybe_unused init_fn_deprecated(char* fn_name) +{ + int i = 0; + @@ -3416,7 +3416,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+void mark_tech_preview(const char *msg, struct module *mod) ++void __maybe_unused mark_tech_preview(const char *msg, struct module *mod) +{ + const char *str = NULL; + @@ -3446,7 +3446,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+void mark_partner_supported(const char *msg, struct module *mod) ++void __maybe_unused mark_partner_supported(const char *msg, struct module *mod) +{ + const char *str = NULL; + @@ -3484,7 +3484,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+bool pci_rh_check_status(struct pci_dev *pci_dev) ++bool __maybe_unused pci_rh_check_status(struct pci_dev *pci_dev) +{ + if (pci_dev->driver->driver.owner != NULL) { + if (!test_bit(TAINT_OOT_MODULE, &pci_dev->driver->driver.owner->taints)) { @@ -3505,7 +3505,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+void module_rh_check_status(const char * module_name) ++void __maybe_unused module_rh_check_status(const char * module_name) +{ + driver_unmaintained(module_name); + driver_deprecated(module_name); @@ -3521,7 +3521,7 @@ index 000000000000..48a6bb6c9b38 + * + * Reserved for Internal Red Hat use only. + */ -+void init_rh_check_status(char *fn_name) ++void __maybe_unused init_rh_check_status(char *fn_name) +{ + init_fn_deprecated(fn_name); + init_fn_unmaintained(fn_name); diff --git a/sources b/sources index 6106e7138..fcc5dbe61 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.6-15029-gbe3ca57cfb77.tar.xz) = 166d85224ad77b1ffda4b0aff453f33a5231db2d76bf0a45388daa8016a964e1a3f0421365ad7b64e5f754f4794d1c33dc6772951a660c5ba315a771fa015e0f -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 696b500882a018f9e451039922b885fb670ab9c08d85a75ad72b8e439a0a1b43a8e11b8ec20e988c2e77dc01b1ebd9213acd07cf961d86dfdc0bf33f368bbb6e -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 2b989dc3a5d7ccdc8e877166afeeb4b04e9e78a0090b39c2055650a729380ae139bdc37c1886f9b20113478baa66d07ef0d0da0d9bde2a2d0a0a949abfdaea41 +SHA512 (linux-6.6-15365-g305230142ae0.tar.xz) = d020d54b38fcfe46fb3eb87f53c10c1eef4b6789e140f35cce5894e77bfc9f599591ef0cfb4b4c3847e92a59ce3d861b81b34b94e25c36f8d7f8df8fb91b52a6 +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 90d2d5a9364d6b1382b04bcc89a7628ace781c7139b3a5775a4d3adab37f19bd22883b799aec7e2272d1459413cb99c23070b7fe4cc86e896d573ae494ca6807 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 405da14d0dc8573b5f664fc36bd3c4129532a4b8ace77c9444fdeaf0d7cebe867b1a3eba183c5cfd5f83c851c39d163c456caf71753ac684b3cc4025768a8212