From 0bf6cc092ecec504a52b2f7c5f1b49b983338f90 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 6 Mar 2023 08:58:32 -0600 Subject: [PATCH] kernel-6.3.0-0.rc1.16 * Mon Mar 06 2023 Fedora Kernel Team [6.3.0-0.rc1.16] - Add rtla-hwnoise files (Justin M. Forbes) - redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for RHEL (Prarit Bhargava) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 3 +- kernel-aarch64-debug-rhel.config | 2 -- kernel-aarch64-fedora.config | 3 +- kernel-aarch64-rhel.config | 2 -- kernel-armv7hl-debug-fedora.config | 3 +- kernel-armv7hl-fedora.config | 3 +- kernel-armv7hl-lpae-debug-fedora.config | 3 +- kernel-armv7hl-lpae-fedora.config | 3 +- kernel-ppc64le-debug-fedora.config | 3 +- kernel-ppc64le-debug-rhel.config | 2 -- kernel-ppc64le-fedora.config | 3 +- kernel-ppc64le-rhel.config | 2 -- kernel-s390x-debug-fedora.config | 3 +- kernel-s390x-debug-rhel.config | 2 -- kernel-s390x-fedora.config | 3 +- kernel-s390x-rhel.config | 2 -- kernel-s390x-zfcpdump-rhel.config | 2 -- kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-fedora.config | 1 + kernel.spec | 43 ++++++++++++++++++------- patch-6.3-redhat.patch | 18 +++++------ sources | 6 ++-- 23 files changed, 57 insertions(+), 58 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 81beab618..6f3deb6db 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 = 13 +RHEL_RELEASE = 16 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 179c1c35d..b3bb2e2ed 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1545,8 +1545,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set @@ -6288,6 +6286,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_AS3722=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CADENCE=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 2cd352adb..de3f47cfc 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1168,8 +1168,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 20178d5c7..37f3aac6d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1545,8 +1545,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set @@ -6267,6 +6265,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_AS3722=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CADENCE=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index f88a97f1f..928e664e8 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1168,8 +1168,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 51617f507..a309b6173 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1504,8 +1504,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -6274,6 +6272,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_AS3722=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CADENCE=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 656e2d791..650d8e9bf 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1504,8 +1504,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -6255,6 +6253,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_AS3722=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CADENCE=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index e17a90120..c26bb139b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1475,8 +1475,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -6105,6 +6103,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_AS3722=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CADENCE=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ea7946108..4eaf35527 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1475,8 +1475,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -6086,6 +6084,7 @@ CONFIG_RTC_DRV_ABX80X=m CONFIG_RTC_DRV_AC100=m CONFIG_RTC_DRV_ARMADA38X=m CONFIG_RTC_DRV_AS3722=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_CADENCE=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d77ec5c8d..8aeafac28 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1135,8 +1135,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -5209,6 +5207,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_ABEOZ9=m CONFIG_RTC_DRV_ABX80X=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m # CONFIG_RTC_DRV_CADENCE is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 732b0f276..77562ee8d 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -997,8 +997,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index c913ba175..7013fe173 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1134,8 +1134,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -5188,6 +5186,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_ABEOZ9=m CONFIG_RTC_DRV_ABX80X=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m # CONFIG_RTC_DRV_CADENCE is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index df67436c3..47e233ecc 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -997,8 +997,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index e05e0cd3a..24a5b6091 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1141,8 +1141,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -5140,6 +5138,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_ABEOZ9=m CONFIG_RTC_DRV_ABX80X=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m # CONFIG_RTC_DRV_CADENCE is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 637f4d8c9..a2168cb3a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -998,8 +998,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 739ae8db4..4bf1ade45 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1140,8 +1140,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set # CONFIG_CRYPTO_SM4_GENERIC is not set @@ -5119,6 +5117,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_ABEOZ9=m CONFIG_RTC_DRV_ABX80X=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m # CONFIG_RTC_DRV_CADENCE is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d6a8e17b8..4ab8040df 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -998,8 +998,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 86080c052..f0615072e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1003,8 +1003,6 @@ CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_SM3_GENERIC is not set # CONFIG_CRYPTO_SM3 is not set # CONFIG_CRYPTO_SM3_NEON is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set -# CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set # CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set # CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6356b9fd2..80da95b15 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5553,6 +5553,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_ABEOZ9=m CONFIG_RTC_DRV_ABX80X=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m # CONFIG_RTC_DRV_CADENCE is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8620622cd..a839c0752 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5533,6 +5533,7 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_DRV_ABB5ZES3 is not set CONFIG_RTC_DRV_ABEOZ9=m CONFIG_RTC_DRV_ABX80X=m +# CONFIG_RTC_DRV_BBNSM is not set CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ4802=m # CONFIG_RTC_DRV_CADENCE is not set diff --git a/kernel.spec b/kernel.spec index ed093259c..12d9f078d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -141,13 +141,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.3.0 %define patchversion 6.3 -%define pkgrelease 0.rc0.20230303git2eb29d59ddf0.13 +%define pkgrelease 0.rc1.16 %define kversion 6 -%define tarfile_release 6.2-13277-g2eb29d59ddf0 +%define tarfile_release 6.3-rc1 # This is needed to do merge window version magic %define patchlevel 3 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20230303git2eb29d59ddf0.13%{?buildid}%{?dist} +%define specrelease 0.rc1.16%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.3.0 @@ -1095,23 +1095,31 @@ and root causes of unexpected results. %if %{with_bpftool} +%define bpftoolversion 7.2.0 + %package -n bpftool Summary: Inspection and simple manipulation of eBPF programs and maps License: GPLv2 +Version: %{bpftoolversion} %description -n bpftool This package contains the bpftool, which allows inspection and simple manipulation of eBPF programs and maps. %package -n bpftool-debuginfo Summary: Debug information for package bpftool +Version: %{bpftoolversion} Group: Development/Debug -Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release} +Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specversion}-%{release} AutoReqProv: no %description -n bpftool-debuginfo This package provides debug information for the bpftool package. %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_sbindir}/bpftool(\.debug)?|XXX' -o bpftool-debuginfo.list} +# Setting "Version:" above overrides the internal {version} macro, +# need to restore it here +%define version %{specversion} + # with_bpftool %endif @@ -2511,7 +2519,7 @@ pushd tools/testing/selftests force_targets="" %endif -%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf vm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install +%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf mm livepatch net net/forwarding net/mptcp netfilter tc-testing memfd" SKIP_TARGETS="" $force_targets 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. @@ -2797,11 +2805,11 @@ find . -type f -executable -exec install -m755 {} %{buildroot}%{_libexecdir}/ksa find . -type f ! -executable -exec install -m644 {} %{buildroot}%{_libexecdir}/ksamples/pktgen/{} \; popd popd -# install vm selftests -pushd tools/testing/selftests/vm -find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/vm/{} \; -find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/vm/{} \; -find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/vm/{} \; +# install mm selftests +pushd tools/testing/selftests/mm +find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/mm/{} \; +find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/mm/{} \; +find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/mm/{} \; popd # install drivers/net/mlxsw selftests pushd tools/testing/selftests/drivers/net/mlxsw @@ -3356,10 +3364,23 @@ fi # # %changelog -* Fri Mar 03 2023 Fedora Kernel Team [6.3.0-0.rc0.2eb29d59ddf0.13] +* Mon Mar 06 2023 Fedora Kernel Team [6.3.0-0.rc1.16] - Add rtla-hwnoise files (Justin M. Forbes) - redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency for RHEL (Prarit Bhargava) + +* Mon Mar 06 2023 Fedora Kernel Team [6.3.0-0.rc1.15] +- redhat/configs: CONFIG_HP_ILO location fix (Vladis Dronov) +- Linux v6.3.0-0.rc1 + +* Sun Mar 05 2023 Fedora Kernel Team [6.3.0-0.rc0.b01fe98d34f3.14] +- Linux v6.3.0-0.rc0.b01fe98d34f3 + +* Sat Mar 04 2023 Fedora Kernel Team [6.3.0-0.rc0.0988a0ea7919.13] +- redhat: Fix build for kselftests mm (Nico Pache) - fix tools build after vm to mm rename (Justin M. Forbes) +- redhat/spec: Update bpftool versioning scheme (Viktor Malik) +- redhat/configs: CONFIG_CRYPTO_SM4_AESNI_AVX*_X86_64 is x86 only (Prarit Bhargava) +- Linux v6.3.0-0.rc0.0988a0ea7919 * Fri Mar 03 2023 Fedora Kernel Team [6.3.0-0.rc0.2eb29d59ddf0.12] - Linux v6.3.0-0.rc0.2eb29d59ddf0 diff --git a/patch-6.3-redhat.patch b/patch-6.3-redhat.patch index 6dce581e2..a3a178347 100644 --- a/patch-6.3-redhat.patch +++ b/patch-6.3-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index aa26f34a9b52..25ad60532278 100644 +index d7bd0eb9b346..43b6f18d37d0 100644 --- a/Makefile +++ b/Makefile @@ -199,6 +199,9 @@ endif @@ -1227,10 +1227,10 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 8698410aeb84..0f994d356f54 100644 +index c2730b116dc6..6e35eeb6ed9f 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) +@@ -251,6 +251,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1240,7 +1240,7 @@ index 8698410aeb84..0f994d356f54 100644 switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -340,6 +343,7 @@ enum nvme_disposition { +@@ -341,6 +344,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1248,7 +1248,7 @@ index 8698410aeb84..0f994d356f54 100644 AUTHENTICATE, }; -@@ -351,15 +355,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -352,15 +356,16 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if ((nvme_req(req)->status & 0x7ff) == NVME_SC_AUTH_REQUIRED) return AUTHENTICATE; @@ -1268,7 +1268,7 @@ index 8698410aeb84..0f994d356f54 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -389,6 +394,14 @@ static inline void nvme_end_req(struct request *req) +@@ -390,6 +395,14 @@ static inline void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -1283,7 +1283,7 @@ index 8698410aeb84..0f994d356f54 100644 void nvme_complete_rq(struct request *req) { struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -409,6 +422,9 @@ void nvme_complete_rq(struct request *req) +@@ -410,6 +423,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -2648,10 +2648,10 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/kernel/panic.c b/kernel/panic.c -index 487f5b03bf83..97adb693f86c 100644 +index 5cfea8302d23..538a628be49d 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -471,6 +471,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -479,6 +479,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, [ TAINT_TEST ] = { 'N', ' ', true }, diff --git a/sources b/sources index 6798d847d..6cc0adf78 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-13277-g2eb29d59ddf0.tar.xz) = 0952e4905c37240dc05c68e7fe7d19d0d58aed4fdfa74ac1fceae3266e33bd6e98b67afcbcab2bb3232525fce2b4502ba45a5e0bf8d7db4e6a7e535e107d8cec -SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 83818541afa162df9b5310334ae4225bd8be76fe0ad6098270d2563fa1a0bb5be41b420d1df6eaaea1bc37f8e736bf0a27d255f1b283c81e481f9f8772f6cfab -SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 01239a6d9e9ed9d5e85eacad4383d6398510a194b18fc1b4795a890b8762bb77330dae7db0b623aa98372ead4f2b9f7eb5051b64511368b776ef60a3b08625ac +SHA512 (linux-6.3-rc1.tar.xz) = ae3ec10033ac54b09623c62cf2dbad0b3d87a62ca49f16a4a8e2809348a3e8b06b9a6d38ad92f60a86d06004dbe1a35bb0ec9ea36a039ac1a2bc4680b4c69088 +SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = cf434648d14fff255d73df45db4560339a6ac85bbfc0a9fafd3cfbb2e5d44f988c42645d9821c5d1a9e033d1328416099a19b7dc51edb922874cc81b522b13be +SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 3438593c80b97b500b9d5648b3c15d3c452564b810a5efb17acd55aba91d3e1c141bbabdb8ec7c6b1755cb7feaa1137588dec7909ba44a8d208400b656ec93ac