diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 9c5726d39..9fe5b7f98 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -1680,7 +1680,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set CONFIG_CSD_LOCK_WAIT_DEBUG=y -# CONFIG_CUSE is not set +CONFIG_CUSE=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 5b262fb2e..6b1b8813d 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -1680,7 +1680,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set # CONFIG_CSD_LOCK_WAIT_DEBUG is not set -# CONFIG_CUSE is not set +CONFIG_CUSE=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a1308db11..1e86713b7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1680,7 +1680,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set CONFIG_CSD_LOCK_WAIT_DEBUG=y -# CONFIG_CUSE is not set +CONFIG_CUSE=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1f240b7bc..49c1e7c04 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1680,7 +1680,7 @@ CONFIG_CRYPTO=y CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG_DEFAULT is not set # CONFIG_CSD_LOCK_WAIT_DEBUG is not set -# CONFIG_CUSE is not set +CONFIG_CUSE=m CONFIG_CW1200=m CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m diff --git a/kernel.changelog b/kernel.changelog index 7e62d3bd3..6754e25b7 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Sun May 26 2024 Justin M. Forbes [6.9.2-0] +- redhat/configs: fedora: aarch64: Re-enable CUSE (Neal Gompa) +- Linux v6.9.2 +Resolves: + * Tue May 21 2024 Justin M. Forbes [6.9.1-0] - Fix mismatch in IO_URING since we dropped the RHEL patch (Justin M. Forbes) - Set up for stable Fedora (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index 7509217e8..b1ad5bcb0 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.9.1 -%define specversion 6.9.1 +%define specrpmversion 6.9.2 +%define specversion 6.9.2 %define patchversion 6.9 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.9.1 +%define tarfile_release 6.9.2 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.9.1 +%define kabiversion 6.9.2 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3949,6 +3949,10 @@ fi\ # # %changelog +* Sun May 26 2024 Justin M. Forbes [6.9.2-0] +- redhat/configs: fedora: aarch64: Re-enable CUSE (Neal Gompa) +- Linux v6.9.2 + * Tue May 21 2024 Justin M. Forbes [6.9.1-0] - Fix mismatch in IO_URING since we dropped the RHEL patch (Justin M. Forbes) - Set up for stable Fedora (Justin M. Forbes) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index a44d2666d..aaba9d640 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -72,7 +72,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index a7045435151e..cd6c9c2ff293 100644 +index 8302496ee7a5..73844ab02b6b 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 31cc134dd..bdc30aca9 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.4.3.tar.bz2) = cb87592809af7763cbb47dfb49dd7aada112d37ceb1e555f4171d32991a6dc88c2c6e76ded75a57649946dc909f2f9bc20a01d637a704f97c3a6a13b3404d78b SHA512 (kernel-kabi-dw-6.4.3.tar.bz2) = b790a94af10031835256bba229b1bd954d8677a18b7f74ab6267e36b180dea9b088f69a4f6c5a6508f4a27d287e9c99f5262ab421c34f78792501bf05ba081b5 -SHA512 (linux-6.9.1.tar.xz) = d2f3deaf6f3046ab6c0b4d9091b877e1093ab860a54c677c69f459abb76fee87375cbcf4d0568ab3c8c4a8204d16349631a46b0f2cdf0cb8d0e34e58a1e823ee -SHA512 (kernel-abi-stablelists-6.9.1.tar.xz) = 5448107f20b8d753359f9b8e880b72ea87a4e63bee72ad2ed0e7ee92f8baa7b7ac5e811a0729f0b8d075128a991734467c50ac1ddf92ee434956649b1f3e13e2 -SHA512 (kernel-kabi-dw-6.9.1.tar.xz) = 7c884778fcbc48af1c0e0c1898716773ca292447ab0e13618bb8779ca990c33117f0359c83da0f668d262a16b6f9bd69aecb8a0992fd2947f539ccae586a38bb +SHA512 (linux-6.9.2.tar.xz) = 7217ed7a108762d0782f4ee2731ed5f024930d5403bf360ffd2e5c2f8104e4d9e8d4e2cc8f141d787b106d150da6a6a9799f4f26e6afbf1457d06d48a78b2c8b +SHA512 (kernel-abi-stablelists-6.9.2.tar.xz) = a1bdcc246336e48850c926b3b5438efce5a1e4f51a7a7046bd032ce982e055e2f4ac42929d532e6dbd644d68eedffc0fb4687e710349914206be24b6384f07f0 +SHA512 (kernel-kabi-dw-6.9.2.tar.xz) = 68d6edfe2868f202b5c5a09eebb416f66b33f3eb16201b362ece95de06f5e4da59607f319c438e6a500342ab7f03cce12c4d3ff11c7f1e85623af23771b9bb7e