From bfcb15e1d893809147676906a1d587a313130b7d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 12 Aug 2024 07:51:01 -0600 Subject: [PATCH] kernel-6.11.0-0.rc3.30 * Mon Aug 12 2024 Fedora Kernel Team [6.11.0-0.rc3.30] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-64k-debug-rhel.config | 8 +++++-- kernel-aarch64-64k-rhel.config | 8 +++++-- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 8 +++++-- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 8 +++++-- kernel-aarch64-rt-debug-rhel.config | 8 +++++-- kernel-aarch64-rt-rhel.config | 8 +++++-- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 8 +++++-- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 8 +++++-- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 8 +++++-- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 8 +++++-- kernel-s390x-zfcpdump-rhel.config | 8 +++++-- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 8 +++++-- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 8 +++++-- kernel-x86_64-rt-debug-rhel.config | 8 +++++-- kernel-x86_64-rt-rhel.config | 8 +++++-- kernel.changelog | 16 +++++++++++++- kernel.spec | 19 ++++++++++++---- patch-6.11-redhat.patch | 30 +++++++++++++------------- sources | 6 +++--- 30 files changed, 149 insertions(+), 64 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5e0fdae4a..64f1f44ac 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 = 27 +RHEL_RELEASE = 30 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 3dfd951fa..c1d311688 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6952,7 +6952,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index d2cc0de9a..e34ad3e6c 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6925,7 +6925,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index d61c3772e..fdfd06ccf 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1962,10 +1962,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8199,7 +8203,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 3d0bcd8d2..fe18181b2 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1954,10 +1954,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8174,7 +8178,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f4b4734e8..7f20a9d7d 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6951,7 +6951,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1408a2f47..3b5df4b61 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1960,10 +1960,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8195,7 +8199,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index cf58ba4da..11d49506c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6924,7 +6924,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 0a8a28c7c..69b81f01c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1952,10 +1952,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8170,7 +8174,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 503ff5f03..53a3b4383 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1998,10 +1998,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8245,7 +8249,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index a44d2d47f..0effd19f6 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1990,10 +1990,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8220,7 +8224,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 75457a52e..179b0c357 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5632,7 +5632,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 55126a6ea..ed1344195 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1718,10 +1718,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -7658,7 +7662,7 @@ CONFIG_XMON=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 59f576b73..87c7ca57e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5603,7 +5603,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 8a1a4dd80..1eee83e4a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1710,10 +1710,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -7635,7 +7639,7 @@ CONFIG_XMON=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index d00bb643a..92e891742 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5551,7 +5551,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index d3289c98a..bcc6e625b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1719,10 +1719,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y @@ -7635,7 +7639,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 0e86d923d..f2282d709 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5522,7 +5522,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 52624dfee..c4ec32ad2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1711,10 +1711,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y @@ -7612,7 +7616,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 370f4e04a..19d8ad86e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1712,10 +1712,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y @@ -7634,7 +7638,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 49a5b42d0..e2829fc38 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6049,7 +6049,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 51d88b7c2..9c86b1301 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1851,10 +1851,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8026,7 +8030,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 714e019c3..2c13e73f0 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6021,7 +6021,7 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_RTL8188EE=m CONFIG_RTL8192CE=m -CONFIG_RTL8192CU=m +# CONFIG_RTL8192CU is not set CONFIG_RTL8192DE=m # CONFIG_RTL8192DU is not set CONFIG_RTL8192EE=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 42ed505b1..8c5c37212 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1843,10 +1843,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8002,7 +8006,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 453296267..689acce43 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1889,10 +1889,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8077,7 +8081,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 14b61a000..a9cfb492e 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1881,10 +1881,14 @@ CONFIG_EPOLL=y # CONFIG_EROFS_FS_DEBUG is not set CONFIG_EROFS_FS=m # CONFIG_EROFS_FS_ONDEMAND is not set +# CONFIG_EROFS_FS_PCPU_KTHREAD is not set CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_XATTR=y -# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +CONFIG_EROFS_FS_ZIP_LZMA=y +CONFIG_EROFS_FS_ZIP=y +# CONFIG_EROFS_FS_ZIP_ZSTD is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -8053,7 +8057,7 @@ CONFIG_XMON_DEFAULT_RO_MODE=y CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_XZ_DEC_ARM=y CONFIG_XZ_DEC_IA64=y -# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_MICROLZMA=y CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_SPARC=y # CONFIG_XZ_DEC_TEST is not set diff --git a/kernel.changelog b/kernel.changelog index 36f79a34f..a586d475a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,21 @@ -* Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.27] +* Mon Aug 12 2024 Fedora Kernel Team [6.11.0-0.rc3.30] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Mon Aug 12 2024 Fedora Kernel Team [6.11.0-0.rc3.29] +- Linux v6.11.0-0.rc3 +Resolves: + +* Sun Aug 11 2024 Fedora Kernel Team [6.11.0-0.rc2.5189dafa4cf9.28] +- Linux v6.11.0-0.rc2.5189dafa4cf9 +Resolves: + +* Sat Aug 10 2024 Fedora Kernel Team [6.11.0-0.rc2.34ac1e82e5a7.27] +- kernel: config: enable erofs lzma compression (Ian Kent) +- fedora: disable RTL8192CU in Fedora (Peter Robinson) +- Linux v6.11.0-0.rc2.34ac1e82e5a7 +Resolves: + * Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.26] - redhat: Fix the ownership of /lib/modules/ directory (Vitaly Kuznetsov) - new configs in drivers/phy (Izabela Bakollari) diff --git a/kernel.spec b/kernel.spec index 98de00a89..9ac458d7a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc2.20240809gitee9a43b7cfe2.27 +%define pkgrelease 0.rc3.30 %define kversion 6 -%define tarfile_release 6.11-rc2-111-gee9a43b7cfe2 +%define tarfile_release 6.11-rc3 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240809gitee9a43b7cfe2.27%{?buildid}%{?dist} +%define specrelease 0.rc3.30%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4091,9 +4091,20 @@ fi\ # # %changelog -* Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.27] +* Mon Aug 12 2024 Fedora Kernel Team [6.11.0-0.rc3.30] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Mon Aug 12 2024 Fedora Kernel Team [6.11.0-0.rc3.29] +- Linux v6.11.0-0.rc3 + +* Sun Aug 11 2024 Fedora Kernel Team [6.11.0-0.rc2.5189dafa4cf9.28] +- Linux v6.11.0-0.rc2.5189dafa4cf9 + +* Sat Aug 10 2024 Fedora Kernel Team [6.11.0-0.rc2.34ac1e82e5a7.27] +- kernel: config: enable erofs lzma compression (Ian Kent) +- fedora: disable RTL8192CU in Fedora (Peter Robinson) +- Linux v6.11.0-0.rc2.34ac1e82e5a7 + * Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.26] - redhat: Fix the ownership of /lib/modules/ directory (Vitaly Kuznetsov) - new configs in drivers/phy (Izabela Bakollari) diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 615d60c3e..41cc1e770 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -188,7 +188,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 44c02a6f60a1..721338014e72 100644 +index 0a364e34f50b..f5b101e4c59f 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1807,10 +1807,10 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 053d5b4909cd..20f09734d6e0 100644 +index 33fa01c599ad..dddde9be7037 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) +@@ -262,6 +262,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1820,7 +1820,7 @@ index 053d5b4909cd..20f09734d6e0 100644 switch (status & NVME_SCT_SC_MASK) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -375,6 +378,7 @@ enum nvme_disposition { +@@ -376,6 +379,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1828,7 +1828,7 @@ index 053d5b4909cd..20f09734d6e0 100644 AUTHENTICATE, }; -@@ -383,7 +387,7 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -384,7 +388,7 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if (likely(nvme_req(req)->status == 0)) return COMPLETE; @@ -1837,7 +1837,7 @@ index 053d5b4909cd..20f09734d6e0 100644 (nvme_req(req)->status & NVME_STATUS_DNR) || nvme_req(req)->retries >= nvme_max_retries) return COMPLETE; -@@ -391,10 +395,11 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -392,10 +396,11 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if ((nvme_req(req)->status & NVME_SCT_SC_MASK) == NVME_SC_AUTH_REQUIRED) return AUTHENTICATE; @@ -1851,7 +1851,7 @@ index 053d5b4909cd..20f09734d6e0 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -436,6 +441,14 @@ void nvme_end_req(struct request *req) +@@ -437,6 +442,14 @@ void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1866,7 +1866,7 @@ index 053d5b4909cd..20f09734d6e0 100644 void nvme_complete_rq(struct request *req) { struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -465,6 +478,9 @@ void nvme_complete_rq(struct request *req) +@@ -466,6 +479,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -1924,10 +1924,10 @@ index 91d9eb3c22ef..d44cdba1ffea 100644 /* initialize this in the identify path to cover controller resets */ diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index f900e44243ae..316f461e5867 100644 +index ae5314d32943..7a8e1178d379 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -943,6 +943,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -942,6 +942,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1935,7 +1935,7 @@ index f900e44243ae..316f461e5867 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -985,6 +986,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -984,6 +985,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -2263,7 +2263,7 @@ index 17cccd14765f..7f0cef737224 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 8bb3a3611851..d81d85c6c0de 100644 +index 699f4f9674d9..12c5593b9358 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -122,6 +122,14 @@ static const char *sd_cache_types[] = { @@ -2281,7 +2281,7 @@ index 8bb3a3611851..d81d85c6c0de 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp, struct queue_limits *lim) { -@@ -4339,6 +4347,11 @@ static int __init init_sd(void) +@@ -4344,6 +4352,11 @@ static int __init init_sd(void) goto err_out_class; } @@ -3315,7 +3315,7 @@ index bf6c5f685ea2..649f2fccaddd 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index 6f4ec857bdef..c8e66b448d1b 100644 +index 71396e297499..29e469418075 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -65,6 +65,8 @@ @@ -3355,7 +3355,7 @@ index 6f4ec857bdef..c8e66b448d1b 100644 err = rewrite_section_headers(info, flags); if (err) return err; -@@ -3393,6 +3402,10 @@ void print_modules(void) +@@ -3403,6 +3412,10 @@ void print_modules(void) pr_cont(" [last unloaded: %s%s]", last_unloaded_module.name, last_unloaded_module.taints); pr_cont("\n"); diff --git a/sources b/sources index da42af8b7..9ef5ab511 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc2-111-gee9a43b7cfe2.tar.xz) = 32464fc3c86dca7ae11b98d333b2c64a95010a67aa3bbe95bfd3ecaceb380ebef805c5574761c0f9a1beee6a21ed71856f46f86796a3f39cff034858d5f6a481 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = a9c98eb0a653e8a476f74f91fd12008bb55c513229c2c09888bea08df949cf6fa6692d8325d257f60121540223fd1baa4736125849418ca94b99fd010f8a0f2c -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = aa35be4115f6e001979d1db393d85b85e269381bda6ce31db0bd3671d8cc147a46b685c490f51133daf735c759a925fe910c4c6f28675d09de17aeba942a40e4 +SHA512 (linux-6.11-rc3.tar.xz) = d87de5c563d9157e46b7311f131d0b897207c32e013da59634c239ed94d69b249152bb12aa33ac6a147d3645abae945b28b3d5b299f9636fd299ed1861fd8057 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 091e5aacef72390008a31f74d9155d516ccf24a2d8764c6eb0ff13232d61587dd31d2c8c851a519b89916dc4d00a175dd7287ffd8735cc3e0625e006c0acd18a +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 1a8f7b1df20a140c8237cbad506a616cc6d65c56888844566645c4f3dc49de2655a8dd74f8ee568ed38172b695aee21815495cf68a92a462e75fc53b7f02e996