From f179740e4d0b6618fb769f6b1804acb57352f036 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 1 Dec 2023 14:21:32 -0600 Subject: [PATCH] kernel-6.7.0-0.rc3.20231201git994d5c58e50e.32 * Fri Dec 01 2023 Fedora Kernel Team [6.7.0-0.rc3.994d5c58e50e.32] - ext4: Mark mounting fs-verity filesystems as tech-preview (Alexander Larsson) - erofs: Add tech preview markers at mount (Alexander Larsson) - Enable fs-verity (Alexander Larsson) - Enable erofs (Alexander Larsson) - aarch64: enable uki (Gerd Hoffmann) - redhat: enable CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH as a module for x86 (Patrick Talbert) - Turn CONFIG_MFD_CS42L43_SDW on for RHEL (Justin M. Forbes) - Linux v6.7.0-0.rc3.994d5c58e50e Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 6 +++ kernel-aarch64-64k-debug-rhel.config | 12 ++++-- kernel-aarch64-64k-rhel.config | 12 ++++-- kernel-aarch64-debug-rhel.config | 12 ++++-- kernel-aarch64-rhel.config | 12 ++++-- kernel-aarch64-rt-debug-rhel.config | 12 ++++-- kernel-aarch64-rt-rhel.config | 12 ++++-- kernel-ppc64le-debug-rhel.config | 12 ++++-- kernel-ppc64le-rhel.config | 12 ++++-- kernel-s390x-debug-rhel.config | 12 ++++-- kernel-s390x-rhel.config | 12 ++++-- kernel-s390x-zfcpdump-rhel.config | 12 ++++-- kernel-x86_64-debug-rhel.config | 13 ++++-- kernel-x86_64-rhel.config | 13 ++++-- kernel-x86_64-rt-debug-rhel.config | 13 ++++-- kernel-x86_64-rt-rhel.config | 13 ++++-- kernel.spec | 61 ++++++++++++++++++++++++++-- patch-6.7-redhat.patch | 53 +++++++++++++++++++++++- sources | 6 +-- 20 files changed, 258 insertions(+), 54 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 64f1f44ac..d737e5467 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 = 30 +RHEL_RELEASE = 32 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index f20d1d190..54570a8b7 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/6788547a344123907407878c441401412061007a + 6788547a344123907407878c441401412061007a ext4: Mark mounting fs-verity filesystems as tech-preview + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/17cfb62d66fef8c562cdd953244ca3dae6fcdc4b + 17cfb62d66fef8c562cdd953244ca3dae6fcdc4b erofs: Add tech preview markers at mount + "https://gitlab.com/cki-project/kernel-ark/-/commit"/690828965c5831294064da2c7aebe4de7438eab3 690828965c5831294064da2c7aebe4de7438eab3 kernel/rh_messages.c: Mark functions as possibly unused diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 1d74b58ca..44f3337c0 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1907,7 +1907,12 @@ CONFIG_ENIC=m # CONFIG_EPIC100 is not set CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -2098,7 +2103,9 @@ CONFIG_FSL_PQ_MDIO=m # CONFIG_FSL_RCPM is not set CONFIG_FSL_XGMAC_MDIO=m CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6394,7 +6401,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index b1ea8b64d..0173360a9 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1899,7 +1899,12 @@ CONFIG_ENIC=m # CONFIG_EPIC100 is not set CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -2082,7 +2087,9 @@ CONFIG_FSL_PQ_MDIO=m # CONFIG_FSL_RCPM is not set CONFIG_FSL_XGMAC_MDIO=m CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6370,7 +6377,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 473fa0ba1..461f7553e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1904,7 +1904,12 @@ CONFIG_ENIC=m # CONFIG_EPIC100 is not set CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -2094,7 +2099,9 @@ CONFIG_FSL_PQ_MDIO=m # CONFIG_FSL_RCPM is not set CONFIG_FSL_XGMAC_MDIO=m CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6390,7 +6397,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d922cde02..8a108c5f5 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1896,7 +1896,12 @@ CONFIG_ENIC=m # CONFIG_EPIC100 is not set CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -2078,7 +2083,9 @@ CONFIG_FSL_PQ_MDIO=m # CONFIG_FSL_RCPM is not set CONFIG_FSL_XGMAC_MDIO=m CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6366,7 +6373,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index f94846a1c..66781475e 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1942,7 +1942,12 @@ CONFIG_ENIC=m # CONFIG_EPIC100 is not set CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -2132,7 +2137,9 @@ CONFIG_FSL_PQ_MDIO=m # CONFIG_FSL_RCPM is not set CONFIG_FSL_XGMAC_MDIO=m CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6444,7 +6451,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 7a663f472..32fe11ab8 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1934,7 +1934,12 @@ CONFIG_ENIC=m # CONFIG_EPIC100 is not set CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -2116,7 +2121,9 @@ CONFIG_FSL_PQ_MDIO=m # CONFIG_FSL_RCPM is not set CONFIG_FSL_XGMAC_MDIO=m CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6420,7 +6427,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index e279fa620..ef9f30273 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1666,7 +1666,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -1838,7 +1843,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -5932,7 +5939,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 01c8cca82..67e296448 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1658,7 +1658,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -1822,7 +1827,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -5910,7 +5917,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 66c5d95e1..5114dbb75 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1668,7 +1668,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y @@ -1841,7 +1846,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -5904,7 +5911,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5fd907097..d90714727 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1660,7 +1660,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y @@ -1825,7 +1830,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -5882,7 +5889,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1b5d258b4..9341b3c99 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1662,7 +1662,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set CONFIG_ETHTOOL_NETLINK=y @@ -1829,7 +1834,9 @@ CONFIG_FSCACHE_STATS=y # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y # CONFIG_FS_POSIX_ACL is not set -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set # CONFIG_FTRACE is not set CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5899,7 +5906,6 @@ CONFIG_SND_SOC_CX2072X=m # CONFIG_SND_SOC_INTEL_SKYLAKE is not set # CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 91d3cbc2b..736f18e22 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1782,7 +1782,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -1952,7 +1957,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6154,7 +6161,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 41206c702..c9f52eb21 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1774,7 +1774,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -1936,7 +1941,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6131,7 +6138,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 382cac7c0..50baf0eaf 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1820,7 +1820,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -1990,7 +1995,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6208,7 +6215,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 7d6be729b..c8f5adb32 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1812,7 +1812,12 @@ CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set -# CONFIG_EROFS_FS is not set +# CONFIG_EROFS_FS_DEBUG is not set +CONFIG_EROFS_FS=m +CONFIG_EROFS_FS_POSIX_ACL=y +CONFIG_EROFS_FS_SECURITY=y +CONFIG_EROFS_FS_XATTR=y +# CONFIG_EROFS_FS_ZIP is not set CONFIG_ETHERNET=y CONFIG_ETHOC=m CONFIG_ETHTOOL_NETLINK=y @@ -1974,7 +1979,9 @@ CONFIG_FS_DAX=y # CONFIG_FSL_QDMA is not set # CONFIG_FSL_RCPM is not set CONFIG_FSNOTIFY=y -# CONFIG_FS_VERITY is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +# CONFIG_FS_VERITY_DEBUG is not set +CONFIG_FS_VERITY=y # CONFIG_FTL is not set CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_RECORD_RECURSION is not set @@ -6185,7 +6192,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH=m CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m diff --git a/kernel.spec b/kernel.spec index 871c73164..c4467f4e7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc3.20231129git18d46e76d7c2.30 +%define pkgrelease 0.rc3.20231201git994d5c58e50e.32 %define kversion 6 -%define tarfile_release 6.7-rc3-24-g18d46e76d7c2 +%define tarfile_release 6.7-rc3-134-g994d5c58e50e # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20231129git18d46e76d7c2.30%{?buildid}%{?dist} +%define specrelease 0.rc3.20231201git994d5c58e50e.32%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -285,7 +285,7 @@ Summary: The Linux kernel # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} -%ifarch x86_64 +%ifarch x86_64 aarch64 %define with_efiuki %{?_without_efiuki: 0} %{?!_without_efiuki: 1} %else %define with_efiuki 0 @@ -1654,6 +1654,26 @@ Prebuilt debug unified kernel image for virtual machines. Prebuilt default unified kernel image for virtual machines. %endif +%if %{with_arm64_16k} && %{with_debug} && %{with_efiuki} +%description 16k-debug-uki-virt +Prebuilt 16k debug unified kernel image for virtual machines. +%endif + +%if %{with_arm64_16k_base} && %{with_efiuki} +%description 16k-uki-virt +Prebuilt 16k unified kernel image for virtual machines. +%endif + +%if %{with_arm64_64k} && %{with_debug} && %{with_efiuki} +%description 64k-debug-uki-virt +Prebuilt 64k debug unified kernel image for virtual machines. +%endif + +%if %{with_arm64_64k_base} && %{with_efiuki} +%description 64k-uki-virt +Prebuilt 64k unified kernel image for virtual machines. +%endif + %if %{with_ipaclones} %kernel_ipaclones_package %endif @@ -3358,6 +3378,16 @@ fi\ %kernel_variant_post -v 16k-debug %endif +%if %{with_arm64_16k} && %{with_debug} && %{with_efiuki} +%kernel_variant_posttrans -v 16k-debug -u virt +%kernel_variant_preun -v 16k-debug -u virt +%endif + +%if %{with_arm64_16k_base} && %{with_efiuki} +%kernel_variant_posttrans -v 16k -u virt +%kernel_variant_preun -v 16k -u virt +%endif + %if %{with_arm64_64k_base} %kernel_variant_preun -v 64k %kernel_variant_post -v 64k @@ -3368,6 +3398,16 @@ fi\ %kernel_variant_post -v 64k-debug %endif +%if %{with_arm64_64k} && %{with_debug} && %{with_efiuki} +%kernel_variant_posttrans -v 64k-debug -u virt +%kernel_variant_preun -v 64k-debug -u virt +%endif + +%if %{with_arm64_64k_base} && %{with_efiuki} +%kernel_variant_posttrans -v 64k -u virt +%kernel_variant_preun -v 64k -u virt +%endif + %if %{with_realtime_base} %kernel_variant_preun -v rt %kernel_variant_post -v rt -r (kernel|kernel-smp) @@ -3714,6 +3754,19 @@ fi\ # # %changelog +* Fri Dec 01 2023 Fedora Kernel Team [6.7.0-0.rc3.994d5c58e50e.32] +- ext4: Mark mounting fs-verity filesystems as tech-preview (Alexander Larsson) +- erofs: Add tech preview markers at mount (Alexander Larsson) +- Enable fs-verity (Alexander Larsson) +- Enable erofs (Alexander Larsson) +- aarch64: enable uki (Gerd Hoffmann) +- redhat: enable CONFIG_SND_SOC_INTEL_SOF_DA7219_MACH as a module for x86 (Patrick Talbert) +- Turn CONFIG_MFD_CS42L43_SDW on for RHEL (Justin M. Forbes) +- Linux v6.7.0-0.rc3.994d5c58e50e + +* Thu Nov 30 2023 Fedora Kernel Team [6.7.0-0.rc3.3b47bc037bd4.31] +- Linux v6.7.0-0.rc3.3b47bc037bd4 + * Wed Nov 29 2023 Fedora Kernel Team [6.7.0-0.rc3.18d46e76d7c2.30] - Enable cryptographic acceleration config flags for PowerPC (Mamatha Inamdar) - Also make vmlinuz-virt.efi world readable (Zbigniew Jędrzejewski-Szmek) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 83218c9a7..9abbbdf65 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -44,6 +44,8 @@ drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + fs/afs/main.c | 3 + + fs/erofs/super.c | 9 + + fs/ext4/super.c | 11 + include/linux/crypto.h | 1 + include/linux/efi.h | 22 +- include/linux/kernel.h | 14 + @@ -69,7 +71,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 71 files changed, 2060 insertions(+), 207 deletions(-) + 73 files changed, 2080 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 65731b060e3f..687785c93225 100644 @@ -2180,6 +2182,55 @@ index 6425c81d07de..4b137eeeb1a9 100644 return ret; error_proc: +diff --git a/fs/erofs/super.c b/fs/erofs/super.c +index 3789d6224513..8a3d155dcec8 100644 +--- a/fs/erofs/super.c ++++ b/fs/erofs/super.c +@@ -585,6 +585,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) + struct inode *inode; + struct erofs_sb_info *sbi; + struct erofs_fs_context *ctx = fc->fs_private; ++#ifdef CONFIG_RHEL_DIFFERENCES ++ static bool printed = false; ++#endif + int err; + + sb->s_magic = EROFS_SUPER_MAGIC; +@@ -703,6 +706,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) + return err; + + erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid); ++#ifdef CONFIG_RHEL_DIFFERENCES ++ if (!printed) { ++ mark_tech_preview("EROFS filesystem", NULL); ++ printed = true; ++ } ++#endif + return 0; + } + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index c5fcf377ab1f..2130c0994728 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -5619,6 +5619,17 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) + atomic_set(&sbi->s_warning_count, 0); + atomic_set(&sbi->s_msg_count, 0); + ++#ifdef CONFIG_RHEL_DIFFERENCES ++ if (ext4_has_feature_verity(sb)) { ++ static bool printed = false; ++ ++ if (!printed) { ++ mark_tech_preview("fs-verity on ext4", NULL); ++ printed = true; ++ } ++ } ++#endif ++ + return 0; + + failed_mount10: diff --git a/include/linux/crypto.h b/include/linux/crypto.h index b164da5e129e..59021b8609a7 100644 --- a/include/linux/crypto.h diff --git a/sources b/sources index 6a21049cc..a41fd3c3e 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.7-rc3-24-g18d46e76d7c2.tar.xz) = b256fecb74e150d2c462d6dbf25b1307c3454733476ee5412572e781ca78d3e3da2f6e15fe2b649d3de90c878e3f711f4a4e5399addb0880060c15e707eeb136 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 0ff8f2d5d986aef1843fae83b56678e733fd988aabc02ec2f93b28ff528b7569005ab740660f667b4bbb8a60c8fb7d57c17751ebc7f1d9465637e1bf5c312f14 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = fc363fa022d2b4e04e68694df7175a83cb68398b5ddadaf8c4e0610e1e50b58fa3dbb8b3db68ee4681459d14ec60838ef3f5c83494ce9330b1ef1486768d5158 +SHA512 (linux-6.7-rc3-134-g994d5c58e50e.tar.xz) = ecbb0b1cc8c924a75c147c198e41593101fbe25da94ade48d40185508b5d157e1855331417a547e32b858e05581bf8cc192df8630f66b3717112b120a8e125ff +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = bcd8144f0db4eee69bbacb08c3e5de2285259e248d8c0ef9b03f1e254059e98ff102beacffbe9c2504d1f48c742565a32eea9c44290ce5330d6fae098b0164b7 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 85e77a14df4fe21626ae800fb53326d35fc96ea15f22dc308d8ca985cabe27254f91f95c25f1ac7c01479a471f6efa4e5387c8eed5aa37f9b68c6b2c817b56a4