From 69f6e97d76aee036b6e8d2bce6e2061e850e2e90 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 26 Mar 2024 18:50:42 -0500 Subject: [PATCH 1/4] kernel-6.8.2-300 * Tue Mar 26 2024 Justin M. Forbes [6.8.2-0] - xfs: fix SEEK_HOLE/DATA for regions with active COW extents (Dave Chinner) - redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) - kernel.spec: drop custom mode also for System.map ghost entry (Jan Stancek) - kernel.spec: fix libperf-debuginfo content (Jan Stancek) - redhat/kernel.spec.template: enable cross for base/RT (Peter Robinson) - redhat/kernel.spec.template: Fix cross compiling (Peter Robinson) - Add more bugs to BugsFixed (Justin M. Forbes) - Add bug to BugsFixed (Justin M. Forbes) - Turn on CONFIG_READ_ONLY_THP_FOR_FS for Fedora (Justin M. Forbes) - Change fedora-stable-release.sh to use git am (Justin M. Forbes) - drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) - Revert libcpupower soname bump for F38/39 (Justin M. Forbes) - Fix up requires for UKI (Justin M. Forbes) - drm/amd: Flush GFXOFF requests in prepare stage (Mario Limonciello) - Linux v6.8.2 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 9 +++ kernel-aarch64-16k-debug-fedora.config | 3 +- kernel-aarch64-16k-fedora.config | 3 +- kernel-aarch64-64k-debug-rhel.config | 3 + kernel-aarch64-64k-rhel.config | 3 + kernel-aarch64-debug-fedora.config | 3 +- kernel-aarch64-debug-rhel.config | 3 + kernel-aarch64-fedora.config | 3 +- kernel-aarch64-rhel.config | 3 + kernel-aarch64-rt-debug-rhel.config | 3 + kernel-aarch64-rt-rhel.config | 3 + kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-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.changelog | 18 +++++ kernel.spec | 41 ++++++++---- patch-6.8-redhat.patch | 92 +++++++++++++++++++++++--- sources | 6 +- 21 files changed, 174 insertions(+), 34 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 5adcde884..4a3bdbdb1 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,12 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/fccd579ad79c032dd402f674fd94e80ad52519f6 + fccd579ad79c032dd402f674fd94e80ad52519f6 xfs: fix SEEK_HOLE/DATA for regions with active COW extents + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/43f3e284f6c98c0cb6133ac90e0b4bba02975053 + 43f3e284f6c98c0cb6133ac90e0b4bba02975053 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/6a6428d08805f225c5425fc7c2b3c093267cb206 + 6a6428d08805f225c5425fc7c2b3c093267cb206 drm/amd: Flush GFXOFF requests in prepare stage + "https://gitlab.com/cki-project/kernel-ark/-/commit"/bbd16c78228ab6d4515fc98bd574a9a213e9428c bbd16c78228ab6d4515fc98bd574a9a213e9428c scsi: sd: Add "probe_type" module parameter to allow synchronous probing diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 1e89e29c9..b998859f0 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -2778,6 +2778,7 @@ CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS65219=m CONFIG_GPIO_TPS6586X=y # CONFIG_GPIO_TS4900 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_WATCHDOG=m @@ -6397,7 +6398,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index f29dcc664..ee19cde85 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -2761,6 +2761,7 @@ CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS65219=m CONFIG_GPIO_TPS6586X=y # CONFIG_GPIO_TS4900 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_WATCHDOG=m @@ -6370,7 +6371,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 31a738e4b..92922ac59 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2261,6 +2261,7 @@ CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set @@ -6963,6 +6964,8 @@ CONFIG_TEE=m CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA186_TIMER=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_BPMP_THERMAL=m # CONFIG_TEGRA_GMI is not set CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 2d95e6901..f1151122e 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2245,6 +2245,7 @@ CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set @@ -6938,6 +6939,8 @@ CONFIG_TEE=m CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA186_TIMER=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_BPMP_THERMAL=m # CONFIG_TEGRA_GMI is not set CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 5f3e0a7b3..9c8d74a2b 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2778,6 +2778,7 @@ CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS65219=m CONFIG_GPIO_TPS6586X=y # CONFIG_GPIO_TS4900 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_WATCHDOG=m @@ -6397,7 +6398,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 50f3394a8..4744f5a4c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2257,6 +2257,7 @@ CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set @@ -6959,6 +6960,8 @@ CONFIG_TEE=m CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA186_TIMER=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_BPMP_THERMAL=m # CONFIG_TEGRA_GMI is not set CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e5b0d423d..65d1fa056 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2761,6 +2761,7 @@ CONFIG_GPIO_TPS65086=m CONFIG_GPIO_TPS65219=m CONFIG_GPIO_TPS6586X=y # CONFIG_GPIO_TS4900 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set CONFIG_GPIO_VIRTIO=m CONFIG_GPIO_WATCHDOG=m @@ -6370,7 +6371,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 2f56462d9..cf4df91c0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2241,6 +2241,7 @@ CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set @@ -6934,6 +6935,8 @@ CONFIG_TEE=m CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA186_TIMER=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_BPMP_THERMAL=m # CONFIG_TEGRA_GMI is not set CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 12304d7bf..72114a6e3 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2296,6 +2296,7 @@ CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set @@ -7012,6 +7013,8 @@ CONFIG_TEE=m CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA186_TIMER=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_BPMP_THERMAL=m # CONFIG_TEGRA_GMI is not set CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 801dac995..8240e05dd 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2280,6 +2280,7 @@ CONFIG_GPIO_TEGRA186=y CONFIG_GPIO_TEGRA=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_VF610 is not set # CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set @@ -6987,6 +6988,8 @@ CONFIG_TEE=m CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA186_TIMER=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_TEGRA210_ADMA=m +CONFIG_TEGRA_ACONNECT=m CONFIG_TEGRA_BPMP_THERMAL=m # CONFIG_TEGRA_GMI is not set CONFIG_TEGRA_HOST1X_FIREWALL=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 36f1dc78f..5b33e186f 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5225,7 +5225,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 0901ec10a..e46e355cb 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5196,7 +5196,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 86848e4e0..4c754f944 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5146,7 +5146,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 2d5584159..578329c82 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5117,7 +5117,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5ad22bed3..b991e47a2 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5631,7 +5631,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3ddd25e61..e5bed0509 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5603,7 +5603,7 @@ CONFIG_RDS_TCP=m CONFIG_RD_XZ=y CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set -# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_READ_ONLY_THP_FOR_FS=y CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=m # CONFIG_REED_SOLOMON_TEST is not set diff --git a/kernel.changelog b/kernel.changelog index 2c0d175fa..639a94e9f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,21 @@ +* Tue Mar 26 2024 Justin M. Forbes [6.8.2-0] +- xfs: fix SEEK_HOLE/DATA for regions with active COW extents (Dave Chinner) +- redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) +- kernel.spec: drop custom mode also for System.map ghost entry (Jan Stancek) +- kernel.spec: fix libperf-debuginfo content (Jan Stancek) +- redhat/kernel.spec.template: enable cross for base/RT (Peter Robinson) +- redhat/kernel.spec.template: Fix cross compiling (Peter Robinson) +- Add more bugs to BugsFixed (Justin M. Forbes) +- Add bug to BugsFixed (Justin M. Forbes) +- Turn on CONFIG_READ_ONLY_THP_FOR_FS for Fedora (Justin M. Forbes) +- Change fedora-stable-release.sh to use git am (Justin M. Forbes) +- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) +- Revert libcpupower soname bump for F38/39 (Justin M. Forbes) +- Fix up requires for UKI (Justin M. Forbes) +- drm/amd: Flush GFXOFF requests in prepare stage (Mario Limonciello) +- Linux v6.8.2 +Resolves: + * Wed Mar 20 2024 Augusto Caringi [6.8.1-0] - redhat/configs: Enable CONFIG_MITIGATION_RFDS (Augusto Caringi) - fedora: Enable MCP9600 (Peter Robinson) diff --git a/kernel.spec b/kernel.spec index 28c73e369..9402d32e5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.8.1 -%define specversion 6.8.1 +%define specrpmversion 6.8.2 +%define specversion 6.8.2 %define patchversion 6.8 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.8.1 +%define tarfile_release 6.8.2 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.1 +%define kabiversion 6.8.2 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -391,8 +391,6 @@ Summary: The Linux kernel %define with_bpftool 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_cross 0 -%define with_cross_headers 0 %define with_ipaclones 0 %endif @@ -422,8 +420,6 @@ Summary: The Linux kernel %define with_bpftool 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_cross 0 -%define with_cross_headers 0 %define with_ipaclones 0 %define with_headers 0 %define with_efiuki 0 @@ -1133,6 +1129,7 @@ This package contains the kernel source perf library. %package -n libperf-devel Summary: Developement files for the perf library from kernel source +Requires: libperf = %{version}-%{release} %description -n libperf-devel This package includes libraries and header files needed for development of applications which use perf library from kernel source. @@ -1149,7 +1146,7 @@ This package provides debug information for the libperf package. # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so(\.debug)?|XXX' -o libperf-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so.*(\.debug)?|XXX' -o libperf-debuginfo.list} # with_libperf %endif @@ -1553,7 +1550,7 @@ Provides: installonlypkg(kernel)\ Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\ Requires(pre): %{kernel_prereq}\ -Requires(pre): systemd >= 254-1\ +Requires(pre): systemd\ %endif\ %endif\ %if %{with_gcov}\ @@ -2484,7 +2481,7 @@ BuildKernel() { fi # build and copy the vmlinux-gdb plugin files into kernel-debuginfo - %{make} %{?_smp_mflags} scripts_gdb + %{make} ARCH=$Arch %{?_smp_mflags} scripts_gdb cp -a --parents scripts/gdb/{,linux/}*.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer # this should be a relative symlink (Kbuild creates an absolute one) ln -s scripts/gdb/vmlinux-gdb.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux-gdb.py @@ -3823,7 +3820,7 @@ fi\ %ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \ %endif\ /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\ -%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\ +%ghost /boot/System.map-%{KVERREL}%{?3:+%{3}}\ %dir /lib/modules\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\ @@ -3962,6 +3959,26 @@ fi\ # # %changelog +* Tue Mar 26 2024 Justin M. Forbes [6.8.2-300] +- Config updates for stable (Justin M. Forbes) + +* Tue Mar 26 2024 Justin M. Forbes [6.8.2-0] +- xfs: fix SEEK_HOLE/DATA for regions with active COW extents (Dave Chinner) +- redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) +- kernel.spec: drop custom mode also for System.map ghost entry (Jan Stancek) +- kernel.spec: fix libperf-debuginfo content (Jan Stancek) +- redhat/kernel.spec.template: enable cross for base/RT (Peter Robinson) +- redhat/kernel.spec.template: Fix cross compiling (Peter Robinson) +- Add more bugs to BugsFixed (Justin M. Forbes) +- Add bug to BugsFixed (Justin M. Forbes) +- Turn on CONFIG_READ_ONLY_THP_FOR_FS for Fedora (Justin M. Forbes) +- Change fedora-stable-release.sh to use git am (Justin M. Forbes) +- drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set (Javier Martinez Canillas) +- Revert libcpupower soname bump for F38/39 (Justin M. Forbes) +- Fix up requires for UKI (Justin M. Forbes) +- drm/amd: Flush GFXOFF requests in prepare stage (Mario Limonciello) +- Linux v6.8.2 + * Wed Mar 20 2024 Augusto Caringi [6.8.1-0] - redhat/configs: Enable CONFIG_MITIGATION_RFDS (Augusto Caringi) - fedora: Enable MCP9600 (Peter Robinson) diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index b23f0d831..da8e6bda1 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -12,6 +12,8 @@ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++---- drivers/firmware/efi/secureboot.c | 38 +++++ + drivers/firmware/sysfb.c | 18 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + drivers/hid/hid-rmi.c | 66 -------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++ drivers/input/rmi4/rmi_driver.c | 124 +++++++++------ @@ -19,6 +21,7 @@ drivers/pci/quirks.c | 24 +++ drivers/scsi/sd.c | 10 ++ drivers/usb/core/hub.c | 7 + + fs/xfs/xfs_iomap.c | 4 +- include/linux/efi.h | 22 ++- include/linux/lsm_hook_defs.h | 2 + include/linux/module.h | 1 + @@ -33,10 +36,10 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 35 files changed, 652 insertions(+), 174 deletions(-) + 38 files changed, 673 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index 95b320ada47c..0c5f6bdb7c1d 100644 +index 33d8e822f6f1..0451e4e79e5c 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -230,10 +233,10 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index e6ed1ba91e5c..6a87d6ca4a84 100644 +index 617f3e0e963d..92d9066ab4c2 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1761,6 +1761,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1757,6 +1757,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; @@ -540,6 +543,55 @@ index 000000000000..de0a3714a5d4 + } + } +} +diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c +index 3c197db42c9d..16e4a2e90fae 100644 +--- a/drivers/firmware/sysfb.c ++++ b/drivers/firmware/sysfb.c +@@ -34,6 +34,22 @@ + #include + #include + ++static int skip_simpledrm; ++ ++static int __init simpledrm_disable(char *opt) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ get_option(&opt, &skip_simpledrm); ++ ++ if (skip_simpledrm) ++ pr_info("The simpledrm driver will not be probed\n"); ++ ++ return 0; ++} ++early_param("nvidia-drm.modeset", simpledrm_disable); ++ + static struct platform_device *pd; + static DEFINE_MUTEX(disable_lock); + static bool disabled; +@@ -85,7 +101,7 @@ static __init int sysfb_init(void) + + /* try to create a simple-framebuffer device */ + compatible = sysfb_parse_mode(si, &mode); +- if (compatible) { ++ if (compatible && !skip_simpledrm) { + pd = sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) + goto unlock_mutex; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index 94bdb5fa6ebc..1fbaf7b81d69 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -4524,6 +4524,8 @@ int amdgpu_device_prepare(struct drm_device *dev) + if (r) + goto unprepare; + ++ flush_delayed_work(&adev->gfx.gfx_off_delay_work); ++ + for (i = 0; i < adev->num_ip_blocks; i++) { + if (!adev->ip_blocks[i].status.valid) + continue; diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index d4af17fdba46..154f0403cbf4 100644 --- a/drivers/hid/hid-rmi.c @@ -643,7 +695,7 @@ index d4af17fdba46..154f0403cbf4 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index ce1995a2827f..57f9e9de4747 100644 +index 2e2cabc5f50a..8b44d990f978 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -10,6 +10,7 @@ @@ -886,7 +938,7 @@ index 42eaebb3bf5c..7a35119c3144 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index d14413916f93..ff6cbc3fa509 100644 +index cd1210026ac5..448d146c6757 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -897,7 +949,7 @@ index d14413916f93..ff6cbc3fa509 100644 #include #include #include -@@ -3095,6 +3096,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -3106,6 +3107,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -926,7 +978,7 @@ index d14413916f93..ff6cbc3fa509 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index d797df6e5f3e..a6921ee1535a 100644 +index 2ebbe51a7efe..503f79c60365 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1006,6 +1058,28 @@ index e38a4124f610..0a607946e5f9 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); +diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c +index 18c8f168b153..055cdec2e9ad 100644 +--- a/fs/xfs/xfs_iomap.c ++++ b/fs/xfs/xfs_iomap.c +@@ -1323,7 +1323,7 @@ xfs_seek_iomap_begin( + if (cow_fsb != NULLFILEOFF && cow_fsb <= offset_fsb) { + if (data_fsb < cow_fsb + cmap.br_blockcount) + end_fsb = min(end_fsb, data_fsb); +- xfs_trim_extent(&cmap, offset_fsb, end_fsb); ++ xfs_trim_extent(&cmap, offset_fsb, end_fsb - offset_fsb); + seq = xfs_iomap_inode_sequence(ip, IOMAP_F_SHARED); + error = xfs_bmbt_to_iomap(ip, iomap, &cmap, flags, + IOMAP_F_SHARED, seq); +@@ -1348,7 +1348,7 @@ xfs_seek_iomap_begin( + imap.br_state = XFS_EXT_NORM; + done: + seq = xfs_iomap_inode_sequence(ip, 0); +- xfs_trim_extent(&imap, offset_fsb, end_fsb); ++ xfs_trim_extent(&imap, offset_fsb, end_fsb - offset_fsb); + error = xfs_bmbt_to_iomap(ip, iomap, &imap, flags, 0, seq); + out_unlock: + xfs_iunlock(ip, lockmode); diff --git a/include/linux/efi.h b/include/linux/efi.h index c74f47711f0b..e7bbf3b7a938 100644 --- a/include/linux/efi.h @@ -1313,7 +1387,7 @@ index d0eb20f90b26..a99c045730e9 100644 size_t *uctx_len, void *val, size_t val_len, u64 id, u64 flags) diff --git a/kernel/module/main.c b/kernel/module/main.c -index 36681911c05a..7c0a6425dd38 100644 +index b0b99348e1a8..c35cc48d782c 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -528,6 +528,7 @@ static struct module_attribute modinfo_##field = { \ diff --git a/sources b/sources index 3556ae97d..720c7958c 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.8.1.tar.xz) = 27550debb3b1cf07f0ff49a28c390381078e4d1f30a5a08f83dcba9daae822f3fb9fa48d842fef683c1a21d9a5f1ed8da9393b477cbe29fa9330eab81f4d8495 -SHA512 (kernel-abi-stablelists-6.8.1.tar.xz) = fdfb154bac4f8297d2117cd8f741b35a028687b9c4845d8c788232a2273e0f441d31cccdc65887c2e7a1f8a2e6292cd21487b4593474405d543eace9f918afaa -SHA512 (kernel-kabi-dw-6.8.1.tar.xz) = 89bc7384bf2359d479f4fae1c0133861d1eec7f79954c580ada27a929e41fe6d71ddb94ddc7379b5e6d2ab826e34037781fb6552052bae463dd3c9bca693244a +SHA512 (linux-6.8.2.tar.xz) = 4a397c678ee94879b1bf02308580277256005c4cbc204fa6b14a1fabb96fa64518eecfef22d5a127a3000980cdce11b4cada4464dc0a3d6657effae45cdf679e +SHA512 (kernel-abi-stablelists-6.8.2.tar.xz) = 7d7192a7f6d42defa2cd7c4b9cc906be18d8e42f5eb8cf3c249726d95ed1895b314e9664512d42bfe01f6457b5aa2da9c0b92250bba1fc3d7ca74a3836b367c6 +SHA512 (kernel-kabi-dw-6.8.2.tar.xz) = a1fbec386c9694af1bdba5940d59820377b6ffce34df596b1ee04c605f4c5e7f65400494882db3d0181c9602d913851b9b902ba0f87941f19f5b2f3f6fdce0c6 From 525421e019a468bce95dc1b54f164bd79d2a34dc Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 3 Apr 2024 17:21:09 -0500 Subject: [PATCH 2/4] kernel-6.8.3-300 * Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] - Fix up redhat directory for stable reabses (Justin M. Forbes) - Add some CVE fixes for 6.8.3 (Justin M. Forbes) - Add bug to BugsFixed (Justin M. Forbes) - Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" (Johan Hovold) - Config updates for stable (Justin M. Forbes) - Linux v6.8.3 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 ++ kernel.changelog | 9 ++++++ kernel.spec | 15 ++++++--- patch-6.8-redhat.patch | 72 ++++++++++++++++++++++++++++++------------ sources | 6 ++-- 5 files changed, 77 insertions(+), 28 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 4a3bdbdb1..f549dc760 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 + 9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/fccd579ad79c032dd402f674fd94e80ad52519f6 fccd579ad79c032dd402f674fd94e80ad52519f6 xfs: fix SEEK_HOLE/DATA for regions with active COW extents diff --git a/kernel.changelog b/kernel.changelog index 639a94e9f..061eb2473 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,12 @@ +* Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] +- Fix up redhat directory for stable reabses (Justin M. Forbes) +- Add some CVE fixes for 6.8.3 (Justin M. Forbes) +- Add bug to BugsFixed (Justin M. Forbes) +- Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" (Johan Hovold) +- Config updates for stable (Justin M. Forbes) +- Linux v6.8.3 +Resolves: + * Tue Mar 26 2024 Justin M. Forbes [6.8.2-0] - xfs: fix SEEK_HOLE/DATA for regions with active COW extents (Dave Chinner) - redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) diff --git a/kernel.spec b/kernel.spec index 9402d32e5..385b8f7c6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.8.2 -%define specversion 6.8.2 +%define specrpmversion 6.8.3 +%define specversion 6.8.3 %define patchversion 6.8 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.8.2 +%define tarfile_release 6.8.3 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.2 +%define kabiversion 6.8.3 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3959,8 +3959,13 @@ fi\ # # %changelog -* Tue Mar 26 2024 Justin M. Forbes [6.8.2-300] +* Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] +- Fix up redhat directory for stable reabses (Justin M. Forbes) +- Add some CVE fixes for 6.8.3 (Justin M. Forbes) +- Add bug to BugsFixed (Justin M. Forbes) +- Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" (Johan Hovold) - Config updates for stable (Justin M. Forbes) +- Linux v6.8.3 * Tue Mar 26 2024 Justin M. Forbes [6.8.2-0] - xfs: fix SEEK_HOLE/DATA for regions with active COW extents (Dave Chinner) diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index da8e6bda1..f813956f9 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -7,6 +7,7 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ + drivers/bluetooth/hci_qca.c | 13 +- drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + @@ -36,10 +37,10 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 38 files changed, 673 insertions(+), 177 deletions(-) + 39 files changed, 674 insertions(+), 189 deletions(-) diff --git a/Makefile b/Makefile -index 33d8e822f6f1..0451e4e79e5c 100644 +index a78379891d22..71cc94dc40c0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -124,10 +125,10 @@ index d1f3b56e7afc..eaefd0d7cfff 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 84201071dfac..1e7b9e53ec3d 100644 +index 97dd70285741..efc3fbc9e9f3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -21,6 +21,7 @@ +@@ -20,6 +20,7 @@ #include #include #include @@ -135,7 +136,7 @@ index 84201071dfac..1e7b9e53ec3d 100644 #include #include #include -@@ -901,6 +902,13 @@ void __init setup_arch(char **cmdline_p) +@@ -900,6 +901,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -147,9 +148,9 @@ index 84201071dfac..1e7b9e53ec3d 100644 +#endif + reserve_ibft_region(); - dmi_setup(); + x86_init.resources.dmi_setup(); -@@ -1064,19 +1072,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1063,19 +1071,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -281,6 +282,37 @@ index 1a63200ea437..a911e976a596 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); +diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c +index 8a60ad7acd70..4ecbcb1644cc 100644 +--- a/drivers/bluetooth/hci_qca.c ++++ b/drivers/bluetooth/hci_qca.c +@@ -7,7 +7,6 @@ + * + * Copyright (C) 2007 Texas Instruments, Inc. + * Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved. +- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * + * Acknowledgements: + * This file is based on hci_ll.c, which was... +@@ -1904,17 +1903,7 @@ static int qca_setup(struct hci_uart *hu) + case QCA_WCN6750: + case QCA_WCN6855: + case QCA_WCN7850: +- +- /* Set BDA quirk bit for reading BDA value from fwnode property +- * only if that property exist in DT. +- */ +- if (fwnode_property_present(dev_fwnode(hdev->dev.parent), "local-bd-address")) { +- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); +- bt_dev_info(hdev, "setting quirk bit to read BDA from fwnode later"); +- } else { +- bt_dev_dbg(hdev, "local-bd-address` is not present in the devicetree so not setting quirk bit for BDA"); +- } +- ++ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); + hci_set_aosp_capable(hdev); + + ret = qca_read_soc_version(hdev, &ver, soc_type); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c @@ -355,7 +387,7 @@ index a2d0009560d0..4f3486e6a84b 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 4fcda50acfa4..bbbcff15f587 100644 +index 1ea14e86a741..ae3518be391e 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -366,7 +398,7 @@ index 4fcda50acfa4..bbbcff15f587 100644 #include -@@ -990,40 +991,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -992,40 +993,101 @@ int efi_mem_type(unsigned long phys_addr) return -EINVAL; } @@ -978,7 +1010,7 @@ index cd1210026ac5..448d146c6757 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 2ebbe51a7efe..503f79c60365 100644 +index eff7f5df08e2..b58145ce7775 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1013,7 +1045,7 @@ index 2ebbe51a7efe..503f79c60365 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index bdd0acf7fa3c..2adde1beb158 100644 +index d5d3eea006c1..583d0fa2877d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -1031,7 +1063,7 @@ index bdd0acf7fa3c..2adde1beb158 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4069,6 +4077,8 @@ static int __init init_sd(void) +@@ -4084,6 +4092,8 @@ static int __init init_sd(void) goto err_out_class; } @@ -1041,10 +1073,10 @@ index bdd0acf7fa3c..2adde1beb158 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index e38a4124f610..0a607946e5f9 100644 +index 64e54163f05e..aaaa9bca0ee5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5806,6 +5806,13 @@ static void hub_event(struct work_struct *work) +@@ -5815,6 +5815,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1149,7 +1181,7 @@ index c74f47711f0b..e7bbf3b7a938 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 76458b6d53da..b80d5835be72 100644 +index f9b5baf1b5f4..60df2a4b2815 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -411,6 +411,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) @@ -1364,7 +1396,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index d0eb20f90b26..a99c045730e9 100644 +index 3180d823e023..110bca09a1c3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -494,6 +494,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -1372,7 +1404,7 @@ index d0eb20f90b26..a99c045730e9 100644 int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); +int security_lock_kernel_down(const char *where, enum lockdown_reason level); - int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, size_t *uctx_len, + int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags); #else /* CONFIG_SECURITY */ @@ -1433,6 +1434,10 @@ static inline int security_locked_down(enum lockdown_reason what) @@ -1384,7 +1416,7 @@ index d0eb20f90b26..a99c045730e9 100644 + return 0; +} static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, - size_t *uctx_len, void *val, size_t val_len, + u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags) diff --git a/kernel/module/main.c b/kernel/module/main.c index b0b99348e1a8..c35cc48d782c 100644 @@ -1536,10 +1568,10 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 7035ee35a393..e1d54a896ef9 100644 +index a344b8fa5530..51b5bea3b0c7 100644 --- a/security/security.c +++ b/security/security.c -@@ -5511,6 +5511,18 @@ int security_locked_down(enum lockdown_reason what) +@@ -5517,6 +5517,18 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/sources b/sources index 720c7958c..fa2f145a4 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.8.2.tar.xz) = 4a397c678ee94879b1bf02308580277256005c4cbc204fa6b14a1fabb96fa64518eecfef22d5a127a3000980cdce11b4cada4464dc0a3d6657effae45cdf679e -SHA512 (kernel-abi-stablelists-6.8.2.tar.xz) = 7d7192a7f6d42defa2cd7c4b9cc906be18d8e42f5eb8cf3c249726d95ed1895b314e9664512d42bfe01f6457b5aa2da9c0b92250bba1fc3d7ca74a3836b367c6 -SHA512 (kernel-kabi-dw-6.8.2.tar.xz) = a1fbec386c9694af1bdba5940d59820377b6ffce34df596b1ee04c605f4c5e7f65400494882db3d0181c9602d913851b9b902ba0f87941f19f5b2f3f6fdce0c6 +SHA512 (linux-6.8.3.tar.xz) = 0aaee93f869ce314290adb5aa70352f04a292edd55060598e27fdc0ed65ec1dea54263a91c8d9b8dc289657f0330e26fc9bef18c0b988f5b318ab3f65e0f35d2 +SHA512 (kernel-abi-stablelists-6.8.3.tar.xz) = 11e70ca8c104b98386e6cb2cc83fbc150b9e60c60d9ac94ecc37571ca4be102da66093891eb47207d754ca7638f57cb111bca4c0f4573be748b2c754c408ba5f +SHA512 (kernel-kabi-dw-6.8.3.tar.xz) = 0062b7c960734eb41459d5d8a8581d8ac9fbc16ed1f39ff9ab122de47ee4a6fcf4fb82ccf1b4669fb920599220eb765dc35e7d449ca7fab1bdfbbf087841d7df From 3cafd70317fa22328e38d27dafc6395dc9dace57 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 4 Apr 2024 15:00:51 -0500 Subject: [PATCH 3/4] kernel-6.8.4-300 * Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] - Linux v6.8.4 Resolves: Signed-off-by: Justin M. Forbes --- kernel.changelog | 4 ++++ kernel.spec | 11 +++++++---- patch-6.8-redhat.patch | 2 +- sources | 6 +++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/kernel.changelog b/kernel.changelog index 061eb2473..46d12cc94 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] +- Linux v6.8.4 +Resolves: + * Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] - Fix up redhat directory for stable reabses (Justin M. Forbes) - Add some CVE fixes for 6.8.3 (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index 385b8f7c6..3a8aba750 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.8.3 -%define specversion 6.8.3 +%define specrpmversion 6.8.4 +%define specversion 6.8.4 %define patchversion 6.8 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.8.3 +%define tarfile_release 6.8.4 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.3 +%define kabiversion 6.8.4 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3959,6 +3959,9 @@ fi\ # # %changelog +* Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] +- Linux v6.8.4 + * Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] - Fix up redhat directory for stable reabses (Justin M. Forbes) - Add some CVE fixes for 6.8.3 (Justin M. Forbes) diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index f813956f9..53df79a17 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -40,7 +40,7 @@ 39 files changed, 674 insertions(+), 189 deletions(-) diff --git a/Makefile b/Makefile -index a78379891d22..71cc94dc40c0 100644 +index c436247d750c..fba81833741a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index fa2f145a4..1833dc6c9 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.8.3.tar.xz) = 0aaee93f869ce314290adb5aa70352f04a292edd55060598e27fdc0ed65ec1dea54263a91c8d9b8dc289657f0330e26fc9bef18c0b988f5b318ab3f65e0f35d2 -SHA512 (kernel-abi-stablelists-6.8.3.tar.xz) = 11e70ca8c104b98386e6cb2cc83fbc150b9e60c60d9ac94ecc37571ca4be102da66093891eb47207d754ca7638f57cb111bca4c0f4573be748b2c754c408ba5f -SHA512 (kernel-kabi-dw-6.8.3.tar.xz) = 0062b7c960734eb41459d5d8a8581d8ac9fbc16ed1f39ff9ab122de47ee4a6fcf4fb82ccf1b4669fb920599220eb765dc35e7d449ca7fab1bdfbbf087841d7df +SHA512 (linux-6.8.4.tar.xz) = 364d68a76abc1eb7360e155bfae7431d9b1d88289b053c9d06eca685e7ba38100663b43d4e4c274635baaa8fe85cabb25e0d397dbe81010a5f6848b183fdcac3 +SHA512 (kernel-abi-stablelists-6.8.4.tar.xz) = 4c2b4ea557d1554161db6290e4d400d07db316f6f47775b06e3a2a8c3568e654f7bc8ca5bc7af3118ee403cc57ba5f18a276eb946ab4b9088f6efedfdce7cf3c +SHA512 (kernel-kabi-dw-6.8.4.tar.xz) = 44aa3771a2523baaa928fb7d340f0945c24da559d1eff2a03f31fb8b5b0c4f366fac30cba5ae60c28a5884b88db51f4f83c512455062b8aa0451efb78d182452 From 100029c3e47ee9a0bf7924c1fcba8d205c89f830 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 10 Apr 2024 10:52:29 -0500 Subject: [PATCH 4/4] kernel-6.8.5-300 * 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) - redhat/configs: Enable CONFIG_AMDTEE for x86 (David Arcari) - Add CVE fix for 6.8.5 (Justin M. Forbes) - Linux v6.8.5 Resolves: Signed-off-by: Justin M. Forbes --- kernel-x86_64-debug-fedora.config | 5 ++- kernel-x86_64-debug-rhel.config | 5 ++- kernel-x86_64-fedora.config | 5 ++- kernel-x86_64-rhel.config | 5 ++- kernel-x86_64-rt-debug-rhel.config | 5 ++- kernel-x86_64-rt-rhel.config | 5 ++- kernel.changelog | 8 ++++ kernel.spec | 15 +++++-- patch-6.8-redhat.patch | 66 +++++------------------------- sources | 6 +-- 10 files changed, 56 insertions(+), 69 deletions(-) diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index b991e47a2..61a8eb43c 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -274,7 +274,7 @@ CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m CONFIG_AMD_WBRF=y CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7279,6 +7279,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 5ae6509bd..db28e89a2 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6508,6 +6508,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index e5bed0509..0b0bea3d6 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -274,7 +274,7 @@ CONFIG_AMD_PMC=m CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m CONFIG_AMD_WBRF=y CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7249,6 +7249,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index bc5751128..d636fe8f3 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMC=m CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6484,6 +6484,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 5be70d2ad..871439c58 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6561,6 +6561,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 29ec583f0..33b46cf14 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMC=m CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6537,6 +6537,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel.changelog b/kernel.changelog index 46d12cc94..b3dcaaedb 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,11 @@ +* 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) +- redhat/configs: Enable CONFIG_AMDTEE for x86 (David Arcari) +- Add CVE fix for 6.8.5 (Justin M. Forbes) +- Linux v6.8.5 +Resolves: + * Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] - Linux v6.8.4 Resolves: diff --git a/kernel.spec b/kernel.spec index 3a8aba750..63cec8cd0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.8.4 -%define specversion 6.8.4 +%define specrpmversion 6.8.5 +%define specversion 6.8.5 %define patchversion 6.8 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.8.4 +%define tarfile_release 6.8.5 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.4 +%define kabiversion 6.8.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3959,6 +3959,13 @@ fi\ # # %changelog +* 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) +- redhat/configs: Enable CONFIG_AMDTEE for x86 (David Arcari) +- Add CVE fix for 6.8.5 (Justin M. Forbes) +- Linux v6.8.5 + * Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] - Linux v6.8.4 diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index 53df79a17..c0bfddf44 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -7,14 +7,12 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ - drivers/bluetooth/hci_qca.c | 13 +- drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++---- drivers/firmware/efi/secureboot.c | 38 +++++ drivers/firmware/sysfb.c | 18 ++- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + drivers/hid/hid-rmi.c | 66 -------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++ drivers/input/rmi4/rmi_driver.c | 124 +++++++++------ @@ -37,10 +35,10 @@ security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 39 files changed, 674 insertions(+), 189 deletions(-) + 37 files changed, 671 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index c436247d750c..fba81833741a 100644 +index f29a75b75861..90586379d1e8 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -125,7 +123,7 @@ index d1f3b56e7afc..eaefd0d7cfff 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 97dd70285741..efc3fbc9e9f3 100644 +index 3998109195da..cedcd208de44 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -20,6 +20,7 @@ @@ -136,7 +134,7 @@ index 97dd70285741..efc3fbc9e9f3 100644 #include #include #include -@@ -900,6 +901,13 @@ void __init setup_arch(char **cmdline_p) +@@ -901,6 +902,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -150,7 +148,7 @@ index 97dd70285741..efc3fbc9e9f3 100644 reserve_ibft_region(); x86_init.resources.dmi_setup(); -@@ -1063,19 +1071,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1065,19 +1073,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -282,37 +280,6 @@ index 1a63200ea437..a911e976a596 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); -diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c -index 8a60ad7acd70..4ecbcb1644cc 100644 ---- a/drivers/bluetooth/hci_qca.c -+++ b/drivers/bluetooth/hci_qca.c -@@ -7,7 +7,6 @@ - * - * Copyright (C) 2007 Texas Instruments, Inc. - * Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved. -- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. - * - * Acknowledgements: - * This file is based on hci_ll.c, which was... -@@ -1904,17 +1903,7 @@ static int qca_setup(struct hci_uart *hu) - case QCA_WCN6750: - case QCA_WCN6855: - case QCA_WCN7850: -- -- /* Set BDA quirk bit for reading BDA value from fwnode property -- * only if that property exist in DT. -- */ -- if (fwnode_property_present(dev_fwnode(hdev->dev.parent), "local-bd-address")) { -- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); -- bt_dev_info(hdev, "setting quirk bit to read BDA from fwnode later"); -- } else { -- bt_dev_dbg(hdev, "local-bd-address` is not present in the devicetree so not setting quirk bit for BDA"); -- } -- -+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); - hci_set_aosp_capable(hdev); - - ret = qca_read_soc_version(hdev, &ver, soc_type); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c @@ -611,19 +578,6 @@ index 3c197db42c9d..16e4a2e90fae 100644 pd = sysfb_create_simplefb(si, &mode); if (!IS_ERR(pd)) goto unlock_mutex; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index 94bdb5fa6ebc..1fbaf7b81d69 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -4524,6 +4524,8 @@ int amdgpu_device_prepare(struct drm_device *dev) - if (r) - goto unprepare; - -+ flush_delayed_work(&adev->gfx.gfx_off_delay_work); -+ - for (i = 0; i < adev->num_ip_blocks; i++) { - if (!adev->ip_blocks[i].status.valid) - continue; diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index d4af17fdba46..154f0403cbf4 100644 --- a/drivers/hid/hid-rmi.c @@ -970,7 +924,7 @@ index 42eaebb3bf5c..7a35119c3144 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index cd1210026ac5..448d146c6757 100644 +index ad33161f2374..a4bca95d8322 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1045,7 +999,7 @@ index eff7f5df08e2..b58145ce7775 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index d5d3eea006c1..583d0fa2877d 100644 +index 35200a7a7355..738378291882 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -1462,7 +1416,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 267b9a0a3abc..12612f58ca58 100644 +index 6568f8177e39..14d8237af366 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -1473,7 +1427,7 @@ index 267b9a0a3abc..12612f58ca58 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1992,6 +1993,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1995,6 +1996,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -1486,7 +1440,7 @@ index 267b9a0a3abc..12612f58ca58 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2052,6 +2059,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2055,6 +2062,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/sources b/sources index 1833dc6c9..5d4ffa91b 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.8.4.tar.xz) = 364d68a76abc1eb7360e155bfae7431d9b1d88289b053c9d06eca685e7ba38100663b43d4e4c274635baaa8fe85cabb25e0d397dbe81010a5f6848b183fdcac3 -SHA512 (kernel-abi-stablelists-6.8.4.tar.xz) = 4c2b4ea557d1554161db6290e4d400d07db316f6f47775b06e3a2a8c3568e654f7bc8ca5bc7af3118ee403cc57ba5f18a276eb946ab4b9088f6efedfdce7cf3c -SHA512 (kernel-kabi-dw-6.8.4.tar.xz) = 44aa3771a2523baaa928fb7d340f0945c24da559d1eff2a03f31fb8b5b0c4f366fac30cba5ae60c28a5884b88db51f4f83c512455062b8aa0451efb78d182452 +SHA512 (linux-6.8.5.tar.xz) = f956b83e80183f46fc9dc85d8735d27c6c1cc9eef7f93d5b7dfe297acafdb33e83cdc184689c2a12afac87c1c495c217ffba843ccaded7f88b35637db3b2d434 +SHA512 (kernel-abi-stablelists-6.8.5.tar.xz) = 305df0406f1e8516207fe77e8f77b0af116b2b97fdf87426068bb17405b3b9ad2f66d8c8042a5f94b050a980b8f7d752cd9e94b7f42aa74f3fe4594f40634388 +SHA512 (kernel-kabi-dw-6.8.5.tar.xz) = c3df1e59427f2612f0962471ec14469072968616eba69489d6a07bcbf1ee50ff47fd7184cfa42a6e328a038970bec94e4c9231cfafadd61d15a25846807dae51