From 4cf4e42e77a825a3fe50fa6aa5d46165054fbff1 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 22 Apr 2022 11:27:20 -0500 Subject: kernel-5.18.0-0.rc3.d569e86915b7f2f.30 * Fri Apr 22 2022 Fedora Kernel Team [5.18.0-0.rc3.d569e86915b7f2f.30] - redhat/self-test: Clean up data set (Prarit Bhargava) - redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava) - redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava) - redhat/Makefile: Deprecate SINGLE_TARBALL (Prarit Bhargava) - redhat/Makefile: Move SINGLE_TARBALL to Makefile.variables (Prarit Bhargava) - redhat/Makefile: Use RPMVERSION (Prarit Bhargava) - redhat/scripts/rh-dist-git.sh: Use Makefile variables (Prarit Bhargava) - redhat/configs/build_configs.sh: Use Makefile variables (Prarit Bhargava) - redhat/configs/process_configs.sh: Use Makefile variables (Prarit Bhargava) - redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava) - redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 7 ++++--- kernel-aarch64-debug-rhel.config | 4 ++++ kernel-aarch64-fedora.config | 5 +++-- kernel-aarch64-rhel.config | 6 +++++- kernel-armv7hl-debug-fedora.config | 7 ++++--- kernel-armv7hl-fedora.config | 5 +++-- kernel-armv7hl-lpae-debug-fedora.config | 7 ++++--- kernel-armv7hl-lpae-fedora.config | 5 +++-- kernel-ppc64le-debug-fedora.config | 15 ++++++++------- kernel-ppc64le-debug-rhel.config | 4 ++++ kernel-ppc64le-fedora.config | 13 +++++++------ kernel-ppc64le-rhel.config | 6 +++++- kernel-s390x-debug-fedora.config | 7 ++++--- kernel-s390x-debug-rhel.config | 4 ++++ kernel-s390x-fedora.config | 5 +++-- kernel-s390x-rhel.config | 6 +++++- kernel-s390x-zfcpdump-rhel.config | 6 +++++- kernel-x86_64-debug-fedora.config | 7 ++++--- kernel-x86_64-debug-rhel.config | 4 ++++ kernel-x86_64-fedora.config | 5 +++-- kernel-x86_64-rhel.config | 6 +++++- kernel.spec | 19 ++++++++++++------- rpminspect.yaml | 5 +++++ sources | 6 +++--- 25 files changed, 112 insertions(+), 54 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 4866906ef..c66a53750 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 = 31 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 5175716a7..64d1a45d4 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2207,7 +2207,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -3466,10 +3466,11 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set +# CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 -CONFIG_KFENCE=y +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c35990168..f39d8c98d 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2725,8 +2725,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y +# CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 881dda174..1f30e989b 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2191,7 +2191,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -3449,7 +3449,8 @@ CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y # CONFIG_KGDB_KDB is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index c160cbf72..df6e6ae48 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2704,8 +2704,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y -# CONFIG_KFENCE is not set +# CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n +CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 3f143db4d..70bae63d2 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2242,7 +2242,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -3496,10 +3496,11 @@ CONFIG_KEYS_REQUEST_CACHE=y # CONFIG_KEYSTONE_REMOTEPROC is not set CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set +# CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 -CONFIG_KFENCE=y +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 9a5c6b260..0524465b2 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2227,7 +2227,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -3481,7 +3481,8 @@ CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y # CONFIG_KGDB_KDB is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a234da43b..049f01285 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2196,7 +2196,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -3428,10 +3428,11 @@ CONFIG_KEYSTONE_IRQ=m CONFIG_KEYSTONE_USB_PHY=m CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set +# CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 -CONFIG_KFENCE=y +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index dd0289e52..cc3bbcaa6 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2181,7 +2181,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -3413,7 +3413,8 @@ CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y # CONFIG_KGDB_KDB is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 7d7c8ffe8..f4582069d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1732,20 +1732,20 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set -CONFIG_FB_IBM_GXT4500=y +# CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -CONFIG_FB_MATROX_G=y +# CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set +# CONFIG_FB_MATROX is not set # CONFIG_FB_MATROX_MILLENIUM is not set # CONFIG_FB_MATROX_MYSTIQUE is not set -CONFIG_FB_MATROX=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set -CONFIG_FB_OF=y +# CONFIG_FB_OF is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set @@ -1767,7 +1767,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set @@ -2886,10 +2886,11 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set +# CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 -CONFIG_KFENCE=y +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 8955e6fa3..a10509426 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2552,8 +2552,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y +# CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f46381775..9ff574cb1 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1715,20 +1715,20 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FB_FOREIGN_ENDIAN is not set # CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set -CONFIG_FB_IBM_GXT4500=y +# CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set -CONFIG_FB_MATROX_G=y +# CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set +# CONFIG_FB_MATROX is not set # CONFIG_FB_MATROX_MILLENIUM is not set # CONFIG_FB_MATROX_MYSTIQUE is not set -CONFIG_FB_MATROX=y # CONFIG_FB_MB862XX is not set # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_NVIDIA is not set -CONFIG_FB_OF=y +# CONFIG_FB_OF is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set @@ -1750,7 +1750,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set @@ -2869,7 +2869,8 @@ CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y # CONFIG_KGDB_KDB is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 46372700f..f106bedac 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2532,8 +2532,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y -# CONFIG_KFENCE is not set +# CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n +CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 9c2430711..38254af55 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1774,7 +1774,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2863,10 +2863,11 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set +# CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 -CONFIG_KFENCE=y +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1bd57c4dc..65857198e 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2537,8 +2537,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y +# CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 91fb7fa98..c612cfcbb 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1757,7 +1757,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_VT8623 is not set @@ -2846,7 +2846,8 @@ CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y # CONFIG_KGDB_KDB is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 761b0f823..1274f3331 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2517,8 +2517,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y -# CONFIG_KFENCE is not set +# CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n +CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ca63a25b7..b7b28ae8e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2528,8 +2528,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS is not set # CONFIG_KEYS_REQUEST_CACHE is not set -# CONFIG_KFENCE is not set +# CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n +CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 8da4354a1..5cb0f3b46 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1933,7 +1933,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set @@ -3150,10 +3150,11 @@ CONFIG_KEY_NOTIFICATIONS=y CONFIG_KEYS_REQUEST_CACHE=y CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set +# CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 -CONFIG_KFENCE=y +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index d256fdd6c..c98fc6291 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2715,8 +2715,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y +# CONFIG_KFENCE_DEFERRABLE is not set # CONFIG_KFENCE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 27c771919..7067cc79f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1916,7 +1916,7 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set # CONFIG_FB_UDL is not set # CONFIG_FB_UVESA is not set -CONFIG_FB_VESA=y +# CONFIG_FB_VESA is not set # CONFIG_FB_VGA16 is not set # CONFIG_FB_VIA is not set # CONFIG_FB_VIRTUAL is not set @@ -3133,7 +3133,8 @@ CONFIG_KEYS=y # CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m CONFIG_KFENCE_NUM_OBJECTS=255 -CONFIG_KFENCE_SAMPLE_INTERVAL=0 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y # CONFIG_KGDB_KDB is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ecf8ed08f..461483922 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2695,8 +2695,12 @@ CONFIG_KEY_DH_OPERATIONS=y CONFIG_KEY_NOTIFICATIONS=y # CONFIG_KEYS_REQUEST_CACHE is not set CONFIG_KEYS=y -# CONFIG_KFENCE is not set +# CONFIG_KFENCE_DEFERRABLE is not set CONFIG_KFENCE_KUNIT_TEST=m +CONFIG_KFENCE_NUM_OBJECTS=255 +CONFIG_KFENCE_SAMPLE_INTERVAL=100 +CONFIG_KFENCE_STATIC_KEYS=n +CONFIG_KFENCE=y CONFIG_KGDB_HONOUR_BLOCKLIST=y CONFIG_KGDB_KDB=y CONFIG_KGDB_LOW_LEVEL_TRAP=y diff --git a/kernel.spec b/kernel.spec index 3b7c57932..49ecab31e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc3.20220421gitb253435746d9a4a.30 +%global distro_build 0.rc3.20220422gitd569e86915b7f2f.31 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -131,13 +131,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc3.20220421gitb253435746d9a4a.30 +%define pkgrelease 0.rc3.20220422gitd569e86915b7f2f.31 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20220421gitb253435746d9a4a.30%{?buildid}%{?dist} +%define specrelease 0.rc3.20220422gitd569e86915b7f2f.31%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc3-16-gb253435746d9a4a.tar.xz +Source0: linux-5.18-rc3-80-gd569e86915b7f2f.tar.xz Source1: Makefile.rhelver @@ -1384,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc3-16-gb253435746d9a4a -c -mv linux-5.18-rc3-16-gb253435746d9a4a linux-%{KVERREL} +%setup -q -n kernel-5.18-rc3-80-gd569e86915b7f2f -c +mv linux-5.18-rc3-80-gd569e86915b7f2f linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3027,7 +3027,7 @@ fi # # %changelog -* Thu Apr 21 2022 Fedora Kernel Team [5.18.0-0.rc3.b253435746d9a4a.29] +* Fri Apr 22 2022 Fedora Kernel Team [5.18.0-0.rc3.d569e86915b7f2f.30] - redhat/self-test: Clean up data set (Prarit Bhargava) - redhat/Makefile.rhpkg: Remove quotes for RHDISTGIT (Prarit Bhargava) - redhat/scripts/create-tarball.sh: Use Makefile variables (Prarit Bhargava) @@ -3040,6 +3040,11 @@ fi - redhat/kernel.spec.template: Use RPM_BUILD_NCPUS (Prarit Bhargava) - redhat/configs/generate_all_configs.sh: Use Makefile variables (Prarit Bhargava) +* Fri Apr 22 2022 Fedora Kernel Team [5.18.0-0.rc3.d569e86915b7f2f.29] +- fedora: Disable fbdev drivers missed before (Javier Martinez Canillas) +- Redhat: enable Kfence on production servers (Nico Pache) +- redhat: ignore known empty patches on the patches rpminspect test (Herton R. Krzesinski) + * Thu Apr 21 2022 Fedora Kernel Team [5.18.0-0.rc3.b253435746d9a4a.28] - kernel-ark: arch_hw Update CONFIG_MOUSE_VSXXXAA=m (Tony Camuso) [2062909] diff --git a/rpminspect.yaml b/rpminspect.yaml index 4c059887f..b48930795 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -19,3 +19,8 @@ emptyrpm: - kernel-zfcpdump - kernel-zfcpdump-devel-matched - kernel-zfcpdump-modules + +patches: + ignore_list: + - linux-kernel-test.patch + - patch-5.18-redhat.patch diff --git a/sources b/sources index 9ba7f7fa1..89411c764 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc3-16-gb253435746d9a4a.tar.xz) = 7c59b7bdc98d3f01a4ec573921be26103dc9605c45de2686cbc2ec2774f67284cc789f9714ed777a6e8ad7da96f466c17d4303031aa4edee6ec858a787b52fad -SHA512 (kernel-abi-stablelists-5.18.0-0.rc3.20220421gitb253435746d9a4a.30.tar.bz2) = 163c1b6941664c85000e3b40cd45f16f653a257b836f646e244e786953d314f623c4f2521dbd396451675d8f62c1e9a9cf391ecf68ad55dc8b24c129cdc03be3 -SHA512 (kernel-kabi-dw-5.18.0-0.rc3.20220421gitb253435746d9a4a.30.tar.bz2) = 6731423099d751bd9ed769885da0518667e77960d2cceef32e8213486b345198277213246c0802af5acc786d130b2a81cd52eda4915f58b28b0aa88083c3e174 +SHA512 (linux-5.18-rc3-80-gd569e86915b7f2f.tar.xz) = 885fc7239012554ff00b882133d267e53289e6e9fc3e33d7f2c7ce41f68decf59ab6aabf33ae44c678c982f5e80f638b55ef39457b28796c56828c0734918afa +SHA512 (kernel-abi-stablelists-5.18.0-0.rc3.20220422gitd569e86915b7f2f.31.tar.bz2) = e71cc00d6975a4b9cb844b84d113199938f914e80fc376874665ee05b357e736f4f330b460712c923a2e9d2b23506d30b9ed4faf5ff1d9bcd74e143c3f512073 +SHA512 (kernel-kabi-dw-5.18.0-0.rc3.20220422gitd569e86915b7f2f.31.tar.bz2) = 13d9a43b3c7c9ee9002a95bc843a0e8d06efac3fd4b3cd26c62c722bfa095dbcaf03ee3be5fa24b58c7b6d6d68de419a3b410972f3b6be0355f90f5bbd3be854 -- cgit