From 80ac1bc4e67c9c1c3a8e88792e93bbf1bb5b8f8d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 6 Apr 2025 07:39:47 -0600 Subject: [PATCH] kernel-6.15.0-0.rc0.20250406gitf4d2ef48250a.13 * Sun Apr 06 2025 Fedora Kernel Team [6.15.0-0.rc0.f4d2ef48250a.13] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-16k-debug-fedora.config | 2 ++ kernel-aarch64-16k-fedora.config | 2 ++ kernel-aarch64-debug-fedora.config | 2 ++ kernel-aarch64-fedora.config | 2 ++ kernel-aarch64-rt-debug-fedora.config | 2 ++ kernel-aarch64-rt-fedora.config | 2 ++ kernel-ppc64le-debug-fedora.config | 2 ++ kernel-ppc64le-fedora.config | 2 ++ kernel-riscv64-debug-fedora.config | 2 ++ kernel-riscv64-fedora.config | 2 ++ kernel-riscv64-rt-debug-fedora.config | 2 ++ kernel-riscv64-rt-fedora.config | 2 ++ kernel-s390x-debug-fedora.config | 2 ++ kernel-s390x-fedora.config | 2 ++ kernel-x86_64-debug-fedora.config | 2 ++ kernel-x86_64-fedora.config | 2 ++ kernel-x86_64-rt-debug-fedora.config | 2 ++ kernel-x86_64-rt-fedora.config | 2 ++ kernel.changelog | 10 +++++++++- kernel.spec | 14 ++++++++++---- patch-6.15-redhat.patch | 24 ++++++++++++------------ sources | 6 +++--- 24 files changed, 73 insertions(+), 23 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index aab3c7cad..f392a4289 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 = 11 +RHEL_RELEASE = 13 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index e9cd5a7b3..10bad6771 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/67743f315cce972b9eda220b696f88ddc89e105e - 67743f315cce972b9eda220b696f88ddc89e105e apply -Wno-error=unterminated-string-initialization temporarily +https://gitlab.com/cki-project/kernel-ark/-/commit/7db1882e0ffc5da947baf2be980a437265f12755 + 7db1882e0ffc5da947baf2be980a437265f12755 apply -Wno-error=unterminated-string-initialization temporarily https://gitlab.com/cki-project/kernel-ark/-/commit/99c8b56381c2f05815c77e6e41380b3d23559ea0 99c8b56381c2f05815c77e6e41380b3d23559ea0 mei: vsc: Fix fortify-panic caused by invalid counted_by() use diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index b3b6b28c6..64bb347c4 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -7001,6 +7001,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -9299,6 +9300,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index b346c384d..b25e9564e 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6972,6 +6972,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -9268,6 +9269,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f46900429..92018328f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7000,6 +7000,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -9298,6 +9299,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 6f73b65a1..c9ef97f23 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6971,6 +6971,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -9267,6 +9268,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 29dc1de6b..508be1c4c 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -7009,6 +7009,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -9308,6 +9309,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 8a2ca1fb5..75c970ec9 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -6980,6 +6980,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -9277,6 +9278,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set CONFIG_TOUCHSCREEN_ADC=m CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index a8374b69a..38111a46f 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5653,6 +5653,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -7575,6 +7576,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f8bc1e846..05bbdf123 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5623,6 +5623,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -7543,6 +7544,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index a2e23474e..79e6b62ac 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -5701,6 +5701,7 @@ CONFIG_RISCV_ISA_ZAWRS=y CONFIG_RISCV_ISA_ZBA=y CONFIG_RISCV_ISA_ZBB=y CONFIG_RISCV_ISA_ZBC=y +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_RISCV_MISALIGNED=y @@ -7666,6 +7667,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 69d9ab96e..a2b3b0732 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -5671,6 +5671,7 @@ CONFIG_RISCV_ISA_ZAWRS=y CONFIG_RISCV_ISA_ZBA=y CONFIG_RISCV_ISA_ZBB=y CONFIG_RISCV_ISA_ZBC=y +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_RISCV_MISALIGNED=y @@ -7634,6 +7635,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 383ffec9a..f8f935422 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -5710,6 +5710,7 @@ CONFIG_RISCV_ISA_ZAWRS=y CONFIG_RISCV_ISA_ZBA=y CONFIG_RISCV_ISA_ZBB=y CONFIG_RISCV_ISA_ZBC=y +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_RISCV_MISALIGNED=y @@ -7676,6 +7677,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index a67a6a82d..f9e522a8c 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -5680,6 +5680,7 @@ CONFIG_RISCV_ISA_ZAWRS=y CONFIG_RISCV_ISA_ZBA=y CONFIG_RISCV_ISA_ZBB=y CONFIG_RISCV_ISA_ZBC=y +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RISCV_ISA_ZICBOM=y CONFIG_RISCV_ISA_ZICBOZ=y CONFIG_RISCV_MISALIGNED=y @@ -7644,6 +7645,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 6d0181120..6772a6b5e 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5588,6 +5588,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y # CONFIG_RMI4_CORE is not set CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -7517,6 +7518,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 76bc5b15d..566836752 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5558,6 +5558,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y # CONFIG_RMI4_CORE is not set CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -7485,6 +7486,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5fdce84e4..fc5ad01f6 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6095,6 +6095,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -8134,6 +8135,7 @@ CONFIG_TOSHIBA_WMI=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ef980dd03..6f61095c8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6066,6 +6066,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -8103,6 +8104,7 @@ CONFIG_TOSHIBA_WMI=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 915eb7111..82140f1f5 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -6104,6 +6104,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -8144,6 +8145,7 @@ CONFIG_TOSHIBA_WMI=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index cafab38f0..b5a0c1046 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -6075,6 +6075,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m CONFIG_RIONET=m CONFIG_RIONET_RX_SIZE=128 CONFIG_RIONET_TX_SIZE=128 +CONFIG_RISCV_ISA_ZBKB=y CONFIG_RMI4_CORE=m CONFIG_RMI4_F03=y CONFIG_RMI4_F11=y @@ -8113,6 +8114,7 @@ CONFIG_TOSHIBA_WMI=m # CONFIG_TOUCHSCREEN_AD7879 is not set # CONFIG_TOUCHSCREEN_ADC is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set +CONFIG_TOUCHSCREEN_APPLE_Z2=y # CONFIG_TOUCHSCREEN_AR1021_I2C is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set diff --git a/kernel.changelog b/kernel.changelog index 2d9a75f0c..41ece7ca3 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,15 @@ -* Fri Apr 04 2025 Fedora Kernel Team [6.15.0-0.rc0.e48e99b6edf4.11] +* Sun Apr 06 2025 Fedora Kernel Team [6.15.0-0.rc0.f4d2ef48250a.13] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) Resolves: +* Sun Apr 06 2025 Fedora Kernel Team [6.15.0-0.rc0.f4d2ef48250a.12] +- Linux v6.15.0-0.rc0.f4d2ef48250a +Resolves: + +* Sat Apr 05 2025 Fedora Kernel Team [6.15.0-0.rc0.a8662bcd2ff1.11] +- Linux v6.15.0-0.rc0.a8662bcd2ff1 +Resolves: + * Fri Apr 04 2025 Fedora Kernel Team [6.15.0-0.rc0.e48e99b6edf4.10] - Linux v6.15.0-0.rc0.e48e99b6edf4 Resolves: diff --git a/kernel.spec b/kernel.spec index 6271e85dc..70b73ba50 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.15.0 %define specversion 6.15.0 %define patchversion 6.15 -%define pkgrelease 0.rc0.20250404gite48e99b6edf4.11 +%define pkgrelease 0.rc0.20250406gitf4d2ef48250a.13 %define kversion 6 -%define tarfile_release 6.14-13189-ge48e99b6edf4 +%define tarfile_release 6.14-13524-gf4d2ef48250a # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20250404gite48e99b6edf4.11%{?buildid}%{?dist} +%define specrelease 0.rc0.20250406gitf4d2ef48250a.13%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -4229,9 +4229,15 @@ fi\ # # %changelog -* Fri Apr 04 2025 Fedora Kernel Team [6.15.0-0.rc0.e48e99b6edf4.11] +* Sun Apr 06 2025 Fedora Kernel Team [6.15.0-0.rc0.f4d2ef48250a.13] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Sun Apr 06 2025 Fedora Kernel Team [6.15.0-0.rc0.f4d2ef48250a.12] +- Linux v6.15.0-0.rc0.f4d2ef48250a + +* Sat Apr 05 2025 Fedora Kernel Team [6.15.0-0.rc0.a8662bcd2ff1.11] +- Linux v6.15.0-0.rc0.a8662bcd2ff1 + * Fri Apr 04 2025 Fedora Kernel Team [6.15.0-0.rc0.e48e99b6edf4.10] - Linux v6.15.0-0.rc0.e48e99b6edf4 diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 673dc6c6e..795f678c7 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -80,7 +80,7 @@ 79 files changed, 2744 insertions(+), 219 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index f5af86b3c4a2..53fc660e8923 100644 +index 76e538c77e31..24a9106a38c4 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6226,6 +6226,17 @@ @@ -101,7 +101,7 @@ index f5af86b3c4a2..53fc660e8923 100644 ring3mwait=disable [KNL] Disable ring 3 MONITOR/MWAIT feature on supported CPUs. -@@ -7538,6 +7549,15 @@ +@@ -7554,6 +7565,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -192,7 +192,7 @@ index 000000000000..85771d74c34f + +endmenu diff --git a/Makefile b/Makefile -index d138b17b8840..6daff4572877 100644 +index e55726a71d95..6dd4447b6d37 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -214,7 +214,7 @@ index d138b17b8840..6daff4572877 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -358,6 +370,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) +@@ -355,6 +367,17 @@ ifneq ($(filter install,$(MAKECMDGOALS)),) endif endif @@ -232,7 +232,7 @@ index d138b17b8840..6daff4572877 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1320,7 +1343,13 @@ define filechk_version.h +@@ -1325,7 +1348,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -247,7 +247,7 @@ index d138b17b8840..6daff4572877 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) -@@ -1918,6 +1947,23 @@ endif +@@ -1927,6 +1956,23 @@ endif ifdef CONFIG_MODULES @@ -326,7 +326,7 @@ index 3b9d9ccfad63..648ac8c7e1fd 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index b6686d63b754..e5c8047570ab 100644 +index f244c5560e7f..464f915011b8 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -337,7 +337,7 @@ index b6686d63b754..e5c8047570ab 100644 #include #include -@@ -915,6 +916,9 @@ void __init setup_arch(char **cmdline_p) +@@ -914,6 +915,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -4408,7 +4408,7 @@ index 000000000000..84e22b1730cc +} +late_initcall(__add_rh_flag); diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn -index dc081cf46d21..25fe35170155 100644 +index d75897559d18..08226fdd309d 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -20,6 +20,10 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) @@ -4423,7 +4423,7 @@ index dc081cf46d21..25fe35170155 100644 KBUILD_CFLAGS += -Wframe-larger-than=$(CONFIG_FRAME_WARN) endif diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index c35d22607978..08e338a4d082 100644 +index 92627e8d0e16..cdf4e4c14d0b 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -27,6 +27,7 @@ @@ -4434,7 +4434,7 @@ index c35d22607978..08e338a4d082 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1988,6 +1989,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1983,6 +1984,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -4447,7 +4447,7 @@ index c35d22607978..08e338a4d082 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2057,6 +2064,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2052,6 +2059,7 @@ static void write_mod_c_file(struct module *mod) } add_srcversion(&buf, mod); diff --git a/sources b/sources index 1dbe18c57..3ac0de0f1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.14-13189-ge48e99b6edf4.tar.xz) = e10634deb92ed58ddde11b99d49d7ee2af67cd99648e84855725064769ba49f8fcab92ba9548756fa52c73f770885ae1748b81dfd553349de8cf330e25c5a49b -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 4df1eb58d88c064b21e15cf771fdb7ef4a6e46db68779114cdc29180543d959220bddea2a3a93b2bc7b0525159edd0ec87dd12acd04be5d4066df4b795538eee -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = bdee11b7cfef3f81823e2695d6f1fac53a6b952500c83436a459b5998bf36de24ee93ff0185db7d74640ee7ed158aa9f3d95803c37dd79872e62a9d89a9b7d83 +SHA512 (linux-6.14-13524-gf4d2ef48250a.tar.xz) = f977e2172927afb391f3572dbfcc513f32ed2c0e115c98bc944e5edde90f385173ed04ce243d58bd4f89e236be5e6d599823548b57202a3f4649330ea07a9eea +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = b644a0167d68b27862c9df2e1b19157d31dded598e283df32ba2f14530369df9c9d371cb56ad1c4ee531c589273b4c23071f05b9b3366f4c8d75a83cfa3ce796 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 407b5a57c3094dc416c84169c619c8e77904862541611ef961aab87eb532ef4781519804a7d28346eff2d09dc6d262cc5369a58357c1e4e438b9ff87f55ea509