From 77a998e6219f0f5e8a0e8e214c78107a5b904fbf Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 27 Sep 2022 09:26:17 -0500 Subject: [PATCH] kernel-6.0.0-0.rc7.20220927gita1375562c0a8.48 * Tue Sep 27 2022 Fedora Kernel Team [6.0.0-0.rc7.a1375562c0a8.48] - redhat: Set CONFIG_MAXLINEAR_GPHY to =m (Petr Oros) - redhat/configs enable CONFIG_INTEL_IFS (David Arcari) - redhat: Remove filter-i686.sh.rhel (Prarit Bhargava) - redhat/Makefile: Set PATCHLIST_URL to none for RHEL/cs9 (Prarit Bhargava) - redhat: remove GL_DISTGIT_USER, RHDISTGIT and unify dist-git cloning (Prarit Bhargava) - redhat/Makefile.variables: Add ADD_COMMITID_TO_VERSION (Prarit Bhargava) - kernel.spec: disable vmlinux.h generation for s390 zfcpdump config (Prarit Bhargava) - perf: Require libbpf 0.6.0 or newer (Prarit Bhargava) - kabi: add stablelist helpers (Prarit Bhargava) - Makefile: add kabi targets (Prarit Bhargava) - kabi: add support for symbol namespaces into check-kabi (Prarit Bhargava) - kabi: ignore new stablelist metadata in show-kabi (Prarit Bhargava) - redhat/Makefile: add dist-assert-tree-clean target (Prarit Bhargava) - redhat/kernel.spec.template: Specify vmlinux.h path when building samples/bpf (Prarit Bhargava) [2041365] - spec: Fix separate tools build (Prarit Bhargava) [2054579] - redhat/scripts: Update merge-subtrees.sh with new subtree location (Prarit Bhargava) - redhat/kernel.spec.template: enable dependencies generation (Prarit Bhargava) - redhat: build and include memfd to kernel-selftests-internal (Prarit Bhargava) [2027506] - redhat/kernel.spec.template: Link perf with --export-dynamic (Prarit Bhargava) - redhat: kernel.spec: selftests: abort on build failure (Prarit Bhargava) - redhat: configs: move CONFIG_SERIAL_MULTI_INSTANTIATE=m settings to common/x86 (Jaroslav Kysela) - configs: enable CONFIG_HP_ILO for aarch64 (Mark Salter) - Linux v6.0.0-0.rc7.a1375562c0a8 Resolves: rhbz#2041365, rhbz#2054579, rhbz#2027506 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- check-kabi | 39 ++++++++++++----- kernel-aarch64-debug-rhel.config | 10 ++--- kernel-aarch64-rhel.config | 10 ++--- kernel-ppc64le-debug-rhel.config | 10 ++--- kernel-ppc64le-rhel.config | 10 ++--- kernel-s390x-debug-rhel.config | 10 ++--- kernel-s390x-rhel.config | 10 ++--- kernel-s390x-zfcpdump-rhel.config | 10 ++--- kernel-x86_64-debug-rhel.config | 12 +++--- kernel-x86_64-rhel.config | 12 +++--- kernel.spec | 71 ++++++++++++++++++++++++++----- sources | 6 +-- 13 files changed, 132 insertions(+), 80 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 797b44be9..1c1910003 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 = 47 +RHEL_RELEASE = 48 # # ZSTREAM diff --git a/check-kabi b/check-kabi index f9d4dcb84..3809209ad 100755 --- a/check-kabi +++ b/check-kabi @@ -41,7 +41,8 @@ def load_symvers(symvers, filename): break if in_line == "\n": continue - checksum, symbol, directory, type = in_line.split() + checksum, symbol, directory, type, *ns = in_line.split() + ns = ns[0] if ns else None symvers[symbol] = in_line[0:-1] @@ -57,7 +58,8 @@ def load_kabi(kabi, filename): break if in_line == "\n": continue - checksum, symbol, directory, type = in_line.split() + checksum, symbol, directory, type, *ns = in_line.split() + ns = ns[0] if ns else None kabi[symbol] = in_line[0:-1] @@ -69,11 +71,14 @@ def check_kabi(symvers, kabi): warn = 0 changed_symbols = [] moved_symbols = [] + ns_symbols = [] for symbol in kabi: - abi_hash, abi_sym, abi_dir, abi_type = kabi[symbol].split() + abi_hash, abi_sym, abi_dir, abi_type, *abi_ns = kabi[symbol].split() + abi_ns = abi_ns[0] if abi_ns else None if symbol in symvers: - sym_hash, sym_sym, sym_dir, sym_type = symvers[symbol].split() + sym_hash, sym_sym, sym_dir, sym_type, *sym_ns = symvers[symbol].split() + sym_ns = sym_ns[0] if sym_ns else None if abi_hash != sym_hash: fail = 1 changed_symbols.append(symbol) @@ -81,6 +86,10 @@ def check_kabi(symvers, kabi): if abi_dir != sym_dir: warn = 1 moved_symbols.append(symbol) + + if abi_ns != sym_ns: + warn = 1 + ns_symbols.append(symbol) else: fail = 1 changed_symbols.append(symbol) @@ -96,13 +105,21 @@ def check_kabi(symvers, kabi): if warn: print("*** WARNING - ABI SYMBOLS MOVED ***") - print("") - print("The following symbols moved (typically caused by moving a symbol from being") - print("provided by the kernel vmlinux out to a loadable module):") - print("") - for symbol in moved_symbols: - print(symbol) - print("") + if moved_symbols: + print("") + print("The following symbols moved (typically caused by moving a symbol from being") + print("provided by the kernel vmlinux out to a loadable module):") + print("") + for symbol in moved_symbols: + print(symbol) + print("") + if ns_symbols: + print("") + print("The following symbols changed symbol namespaces:") + print("") + for symbol in ns_symbols: + print(symbol) + print("") """Halt the build, if we got errors and/or warnings. In either case, double-checkig is required to avoid introducing / concealing diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 72ddcac53..948b22f51 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1064,7 +1064,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2482,7 +2482,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -3071,7 +3070,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set @@ -4045,7 +4044,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_BCM_OCOTP is not set @@ -4055,7 +4054,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5295,7 +5294,6 @@ CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_MSM is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index d4879cac6..61c2a6286 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1064,7 +1064,7 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2466,7 +2466,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -3050,7 +3049,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set @@ -4024,7 +4023,7 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_BCM_OCOTP is not set @@ -4034,7 +4033,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5272,7 +5271,6 @@ CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set # CONFIG_SERIAL_MSM is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=y # CONFIG_SERIAL_RP2 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index f7e697d81..a2fac5ba6 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -910,7 +910,7 @@ CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_CRYPTO_DEV_VMX=y -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2299,7 +2299,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -2896,7 +2895,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set @@ -3847,7 +3846,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -3856,7 +3855,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5068,7 +5067,6 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_RP2 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index ced2f2394..2e10db821 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -910,7 +910,7 @@ CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m CONFIG_CRYPTO_DEV_VMX=y -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2283,7 +2283,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -2876,7 +2875,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set # CONFIG_MCB is not set @@ -3827,7 +3826,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -3836,7 +3835,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5047,7 +5046,6 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_RP2 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3bbf54aa7..a0aa42ae2 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -907,7 +907,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2284,7 +2284,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -2883,7 +2882,7 @@ CONFIG_MARVELL_10G_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m CONFIG_MAX_PHYSMEM_BITS=46 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set @@ -3830,7 +3829,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -3839,7 +3838,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5049,7 +5048,6 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index c1e6178fc..2e0bb8acd 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -907,7 +907,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2268,7 +2268,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -2863,7 +2862,7 @@ CONFIG_MARVELL_10G_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m CONFIG_MAX_PHYSMEM_BITS=46 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set @@ -3810,7 +3809,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -3819,7 +3818,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5028,7 +5027,6 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3f5f041e6..e8ab7286c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -912,7 +912,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2279,7 +2279,6 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDMA64 is not set # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IFS is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -2875,7 +2874,7 @@ CONFIG_MARVELL_10G_PHY=m # CONFIG_MAX5821 is not set # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m CONFIG_MAX_PHYSMEM_BITS=46 # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set @@ -3824,7 +3823,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y # CONFIG_NVME_FC is not set # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -3833,7 +3832,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m # CONFIG_NVME_TARGET is not set @@ -5047,7 +5046,6 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 1890f1323..8092ce160 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -956,7 +956,7 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2432,7 +2432,7 @@ CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y -# CONFIG_INTEL_IFS is not set +CONFIG_INTEL_IFS=m # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m CONFIG_INTEL_IOMMU_DEBUGFS=y @@ -3057,7 +3057,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m CONFIG_MAXSMP=y # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set @@ -4023,7 +4023,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -4032,7 +4032,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5264,7 +5264,7 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set +CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ea45256ee..428f26bdf 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -956,7 +956,7 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_VIRTIO is not set -# CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y CONFIG_CRYPTO_DH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y @@ -2416,7 +2416,7 @@ CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y -# CONFIG_INTEL_IFS is not set +CONFIG_INTEL_IFS=m # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEBUGFS is not set @@ -3037,7 +3037,7 @@ CONFIG_MARVELL_PHY=m # CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAX9611 is not set # CONFIG_MAXIM_THERMOCOUPLE is not set -# CONFIG_MAXLINEAR_GPHY is not set +CONFIG_MAXLINEAR_GPHY=m CONFIG_MAXSMP=y # CONFIG_MB1232 is not set # CONFIG_MC3230 is not set @@ -4003,7 +4003,7 @@ CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set -# CONFIG_NVME_AUTH is not set +CONFIG_NVME_AUTH=y CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_REBOOT_MODE is not set @@ -4012,7 +4012,7 @@ CONFIG_NVMEM_SYSFS=y CONFIG_NVME_MULTIPATH=y CONFIG_NVMEM=y CONFIG_NVME_RDMA=m -# CONFIG_NVME_TARGET_AUTH is not set +CONFIG_NVME_TARGET_AUTH=y CONFIG_NVME_TARGET_FCLOOP=m CONFIG_NVME_TARGET_FC=m CONFIG_NVME_TARGET_LOOP=m @@ -5242,7 +5242,7 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_LANTIQ is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_MULTI_INSTANTIATE is not set +CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_SC16IS7XX is not set diff --git a/kernel.spec b/kernel.spec index 613516949..5a124b056 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,20 +120,24 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc7.47 +%define pkgrelease 0.rc7.20220927gita1375562c0a8.48 %define kversion 6 -%define tarfile_release 6.0-rc7 +%define tarfile_release 6.0-rc7-34-ga1375562c0a8 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.47%{?buildid}%{?dist} +%define specrelease 0.rc7.20220927gita1375562c0a8.48%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 +# If this variable is set to 1, a bpf selftests build failure will cause a +# fatal kernel package build error +%define selftests_must_build 0 + # # End of genspec.sh variables # @@ -578,6 +582,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel BuildRequires: gcc-plugin-devel +BuildRequires: kernel-rpm-macros # glibc-static is required for a consistent build environment (specifically # CONFIG_CC_CAN_LINK_STATIC=y). BuildRequires: glibc-static @@ -597,7 +602,7 @@ BuildRequires: sparse BuildRequires: zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison flex xz-devel BuildRequires: audit-libs-devel python3-setuptools BuildRequires: java-devel -BuildRequires: libbpf-devel +BuildRequires: libbpf-devel >= 0.6.0-1 BuildRequires: libbabeltrace-devel BuildRequires: libtraceevent-devel %ifnarch %{arm} s390x @@ -626,7 +631,7 @@ BuildRequires: python3-docutils BuildRequires: zlib-devel binutils-devel %endif %if %{with_selftests} -BuildRequires: clang llvm +BuildRequires: clang llvm fuse-devel %ifnarch %{arm} BuildRequires: numactl-devel %endif @@ -1073,7 +1078,7 @@ This package provides debug information for the bpftool package. %package selftests-internal Summary: Kernel samples and selftests License: GPLv2 -Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3 +Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3, fuse-libs %description selftests-internal Kernel sample programs and selftests. @@ -2191,7 +2196,10 @@ BuildKernel() { %ifnarch armv7hl # Generate vmlinux.h and put it to kernel-devel path - bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + # zfcpdump build does not have btf anymore + if [ "$Variant" != "zfcpdump" ]; then + bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + fi %endif # prune junk from kernel-devel @@ -2271,7 +2279,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags} -Wl,-E" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2343,7 +2351,15 @@ popd # in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr # but there's no way to tell the Makefile to take them from there. %{make} %{?_smp_mflags} headers_install -%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ || true + +# If we re building only tools without kernel, we need to generate config +# headers and prepare tree for modules building. The modules_prepare target +# will cover both. +if [ ! -f include/generated/autoconf.h ]; then + %{make} %{?_smp_mflags} modules_prepare +fi + +%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true # Prevent bpf selftests to build bpftool repeatedly: export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool @@ -2351,7 +2367,8 @@ export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool pushd tools/testing/selftests # We need to install here because we need to call make with ARCH set which # doesn't seem possible to do in the install section. -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install + +%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd" SKIP_TARGETS="" FORCE_TARGETS=%{selftests_must_build} INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install # 'make install' for bpf is broken and upstream refuses to fix it. # Install the needed files manually. @@ -2689,6 +2706,13 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/netfilter/{} find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \; popd + +# install memfd selftests +pushd tools/testing/selftests/memfd +find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/memfd/{} \; +find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/memfd/{} \; +find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/memfd/{} \; +popd %endif ### @@ -3151,6 +3175,31 @@ fi # # %changelog +* Tue Sep 27 2022 Fedora Kernel Team [6.0.0-0.rc7.a1375562c0a8.48] +- redhat: Set CONFIG_MAXLINEAR_GPHY to =m (Petr Oros) +- redhat/configs enable CONFIG_INTEL_IFS (David Arcari) +- redhat: Remove filter-i686.sh.rhel (Prarit Bhargava) +- redhat/Makefile: Set PATCHLIST_URL to none for RHEL/cs9 (Prarit Bhargava) +- redhat: remove GL_DISTGIT_USER, RHDISTGIT and unify dist-git cloning (Prarit Bhargava) +- redhat/Makefile.variables: Add ADD_COMMITID_TO_VERSION (Prarit Bhargava) +- kernel.spec: disable vmlinux.h generation for s390 zfcpdump config (Prarit Bhargava) +- perf: Require libbpf 0.6.0 or newer (Prarit Bhargava) +- kabi: add stablelist helpers (Prarit Bhargava) +- Makefile: add kabi targets (Prarit Bhargava) +- kabi: add support for symbol namespaces into check-kabi (Prarit Bhargava) +- kabi: ignore new stablelist metadata in show-kabi (Prarit Bhargava) +- redhat/Makefile: add dist-assert-tree-clean target (Prarit Bhargava) +- redhat/kernel.spec.template: Specify vmlinux.h path when building samples/bpf (Prarit Bhargava) [2041365] +- spec: Fix separate tools build (Prarit Bhargava) [2054579] +- redhat/scripts: Update merge-subtrees.sh with new subtree location (Prarit Bhargava) +- redhat/kernel.spec.template: enable dependencies generation (Prarit Bhargava) +- redhat: build and include memfd to kernel-selftests-internal (Prarit Bhargava) [2027506] +- redhat/kernel.spec.template: Link perf with --export-dynamic (Prarit Bhargava) +- redhat: kernel.spec: selftests: abort on build failure (Prarit Bhargava) +- redhat: configs: move CONFIG_SERIAL_MULTI_INSTANTIATE=m settings to common/x86 (Jaroslav Kysela) +- configs: enable CONFIG_HP_ILO for aarch64 (Mark Salter) +- Linux v6.0.0-0.rc7.a1375562c0a8 + * Mon Sep 26 2022 Fedora Kernel Team [6.0.0-0.rc7.47] - all: cleanup dell config options (Peter Robinson) - redhat: Include more kunit tests (Nico Pache) diff --git a/sources b/sources index 8926ac139..b7be11891 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-rc7.tar.xz) = 167e16de50b53f01d3fb39c9b63a2fc4614a36447021e5898504c405597d4d7e8cbd2c8a6327a8d111f04ce1efcd32fa53fa86cc230324fa083148d6a59cecb8 -SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 2ff6171e8431d37ded7961d710e2ec78e82cdc298b12e2cc122011755178b62e68db77c2a75b937cc57a560da0f8129012b427d14f462ebdbe3bad45588eb57a -SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = f18ed2dc68fc2aeac8fa3753b8d0d4576f5fbf500c4c2adcb143952c35a6dd99df924c4c49a1feec54ae513771f99b3876ee4b4d59f8807ed2a29b26dbe0f3b0 +SHA512 (linux-6.0-rc7-34-ga1375562c0a8.tar.xz) = 2c17652db5e2cfd1767b60dc4124a2f6891d3b290b028d11e512c07ef3562f23c9e8ad5d44b97238bf2ef55f6363004574276c5d49b3971d4a19e10de6d4c391 +SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 41412d509f4d2eecc6bbbf6ac6774ea40c70316517883889ac4ad5e610a056cc46351260aafc66727e23f748f006dc633ab9e9c455606084eefc23f8ed49a3f9 +SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 2eb38ff9e6d342eabc1aee999541427ed66a56af5c83f05a23b3d6edd32f9650637cc814c60b681de0c9dc30e1bce25e2d5633c176b7e622feba907a40cabf2a