diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-04 07:53:12 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-04 07:53:12 +0200 |
| commit | 981cd1ae7d9f83e7eb2b49ec116a60c2844388fd (patch) | |
| tree | 06f5c94298924c84d90bda6e00feda3fa366ded6 | |
| parent | 323cdafa8018cd318c6156cc0b7ec1317a93a406 (diff) | |
| parent | 931af94c6888d2e5664ba2a1c077c24a2c889728 (diff) | |
| download | kernel-981cd1ae7d9f83e7eb2b49ec116a60c2844388fd.tar.gz kernel-981cd1ae7d9f83e7eb2b49ec116a60c2844388fd.tar.xz kernel-981cd1ae7d9f83e7eb2b49ec116a60c2844388fd.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc4.36.vanilla.1.fc35kernel-5.14.0-0.rc4.36.vanilla.1.fc34kernel-5.14.0-0.rc4.36.vanilla.1.fc33
28 files changed, 269 insertions, 165 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 28ddeb911..83e59c409 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 = 32 +RHEL_RELEASE = 36 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 94868b5da..2f559e36b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,9 @@ https://gitlab.com/cki-project/kernel-ark/-/commit/42130f93b60c5e750ed179c98da57046ea298c54 42130f93b60c5e750ed179c98da57046ea298c54 Revert "Drop that for now" +https://gitlab.com/cki-project/kernel-ark/-/commit/f843f86a5b5356d32fa33920ecd399b7a4e2f425 + f843f86a5b5356d32fa33920ecd399b7a4e2f425 Revert "bpf: Add tech preview taint for syscall" + https://gitlab.com/cki-project/kernel-ark/-/commit/807dd7c3997fc8ed8936a3d1b2da1d158cd9500b 807dd7c3997fc8ed8936a3d1b2da1d158cd9500b Revert "scsi: smartpqi: add inspur advantech ids" diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d2a1c4b17..f6dc8a0b9 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1290,7 +1290,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM_CE=m @@ -1391,10 +1391,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1411,7 +1411,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_NEON=m +CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -5559,7 +5559,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_XX=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index d5bb94edb..66cde9685 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -965,7 +965,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM64_CE=m @@ -1028,10 +1028,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -1049,7 +1049,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_NEON=m +CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -4007,7 +4007,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_OSF_PARTITION is not set -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4463,7 +4463,7 @@ CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set CONFIG_RAS=y @@ -5838,7 +5838,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set # CONFIG_TEST_DIV64 is not set # CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_FPU is not set +CONFIG_TEST_FPU=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set @@ -5917,7 +5917,7 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 48543081c..aa775d6d4 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1290,7 +1290,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM_CE=m @@ -1391,10 +1391,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1411,7 +1411,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_NEON=m +CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -5536,7 +5536,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_XX=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 4fb65f312..f2fdbb74c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -965,7 +965,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM64_CE=m @@ -1028,10 +1028,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -1049,7 +1049,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_NEON=m +CONFIG_CRYPTO_POLY1305_NEON=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -3987,7 +3987,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_OSF_PARTITION is not set -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4442,7 +4442,7 @@ CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set CONFIG_RAS=y @@ -5894,7 +5894,7 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e1cc2eee0..ba2ebeb61 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1283,7 +1283,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM_CE=m @@ -1386,10 +1386,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1405,7 +1405,7 @@ CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_POLY1305_ARM=m +CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m @@ -5655,7 +5655,7 @@ CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_XX=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 4d887fc14..d696ea42f 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1283,7 +1283,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM_CE=m @@ -1386,10 +1386,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1405,7 +1405,7 @@ CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_POLY1305_ARM=m +CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m @@ -5633,7 +5633,7 @@ CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_XX=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 2ad34843b..bc460c0a7 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1254,7 +1254,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM_CE=m @@ -1356,10 +1356,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1375,7 +1375,7 @@ CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_POLY1305_ARM=m +CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m @@ -5496,7 +5496,7 @@ CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_XX=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index f496d6bd9..180892bfa 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1254,7 +1254,7 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m -CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32_ARM_CE=m @@ -1356,10 +1356,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1375,7 +1375,7 @@ CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m -CONFIG_CRYPTO_POLY1305_ARM=m +CONFIG_CRYPTO_POLY1305_ARM=y CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m @@ -5474,7 +5474,7 @@ CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m CONFIG_RAPIDIO_CPS_XX=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index ee66187ed..a756214c6 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1101,10 +1101,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 54d4da66b..f20e9f9d6 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1100,10 +1100,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 59164f988..477dab87a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1040,10 +1040,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 1b6e4f0a6..58dbcab1e 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -875,10 +875,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -3816,7 +3816,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set CONFIG_OSF_PARTITION=y -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4255,7 +4255,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set CONFIG_RAS=y @@ -5601,7 +5601,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set # CONFIG_TEST_DIV64 is not set # CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_FPU is not set +CONFIG_TEST_FPU=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set @@ -5680,7 +5680,7 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d4509d367..1b65ee073 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1039,10 +1039,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 5e66fcf30..d1637c237 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -875,10 +875,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -3799,7 +3799,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set CONFIG_OSF_PARTITION=y -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4238,7 +4238,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set CONFIG_RAS=y @@ -5661,7 +5661,7 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 94b70e4c0..7a14686e1 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1043,10 +1043,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 7996870dd..4b0173fcb 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -874,10 +874,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -3796,7 +3796,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_OSF_PARTITION is not set -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4197,7 +4197,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set # CONFIG_RAS is not set @@ -5545,7 +5545,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set # CONFIG_TEST_DIV64 is not set # CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_FPU is not set +CONFIG_TEST_FPU=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set @@ -5624,7 +5624,7 @@ CONFIG_THUNDERX2_PMU=m CONFIG_TIGON3_HWMON=y # CONFIG_TIGON3 is not set CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b18fc6566..2a4ba7717 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1042,10 +1042,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index fc3f57e8a..a4490f262 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -874,10 +874,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -3779,7 +3779,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_OSF_PARTITION is not set -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4180,7 +4180,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set # CONFIG_RAS is not set @@ -5605,7 +5605,7 @@ CONFIG_THUNDERX2_PMU=m CONFIG_TIGON3_HWMON=y # CONFIG_TIGON3 is not set CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 73b642903..48744647b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3801,7 +3801,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_OSF_PARTITION is not set -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS is not set # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4203,7 +4203,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set # CONFIG_RAS is not set @@ -5638,7 +5638,7 @@ CONFIG_THUNDERX2_PMU=m CONFIG_TIGON3_HWMON=y # CONFIG_TIGON3 is not set CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index a06f0fa5b..63652a3d4 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1060,7 +1060,7 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_VPMSUM=m @@ -1131,10 +1131,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1152,7 +1152,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0aca628cc..f2b9a1059 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -856,7 +856,7 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_INTEL=m # CONFIG_CRYPTO_CRC32C_VPMSUM is not set @@ -928,10 +928,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -950,7 +950,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -4015,7 +4015,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set CONFIG_OSF_PARTITION=y -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4444,7 +4444,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set CONFIG_RAS=y @@ -5847,7 +5847,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set # CONFIG_TEST_DIV64 is not set # CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_FPU is not set +CONFIG_TEST_FPU=m # CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set @@ -5932,7 +5932,7 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index df1932739..bf719551b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1059,7 +1059,7 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32C_VPMSUM=m @@ -1130,10 +1130,10 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=y CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_LZ4=m @@ -1151,7 +1151,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index a0e0e02dd..4b59a9103 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -856,7 +856,7 @@ CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_CHACHA20_X86_64=m +CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_INTEL=m # CONFIG_CRYPTO_CRC32C_VPMSUM is not set @@ -928,10 +928,10 @@ CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_KEYWRAP is not set # CONFIG_CRYPTO_KHAZAD is not set CONFIG_CRYPTO_LIB_BLAKE2S=m -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA=y CONFIG_CRYPTO_LIB_CURVE25519=m -CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LRW=m # CONFIG_CRYPTO_LZ4HC is not set # CONFIG_CRYPTO_LZ4 is not set @@ -950,7 +950,7 @@ CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_POLY1305_X86_64=m +CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -3996,7 +3996,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set CONFIG_OSF_PARTITION=y -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4424,7 +4424,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set CONFIG_RAS=y @@ -5910,7 +5910,7 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set diff --git a/kernel.spec b/kernel.spec index 3c1f2fcc6..e991af44b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc3.20210728git4010a528219e.32 +%global distro_build 0.rc4.36 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -126,13 +126,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc3.20210728git4010a528219e.32 +%define pkgrelease 0.rc4.36 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20210728git4010a528219e.32%{?buildid}%{?dist} +%define specrelease 0.rc4.36%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -673,7 +673,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc3-38-g4010a528219e.tar.xz +Source0: linux-5.14-rc4.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc3-38-g4010a528219e -c -mv linux-5.14-rc3-38-g4010a528219e linux-%{KVERREL} +%setup -q -n kernel-5.14-rc4 -c +mv linux-5.14-rc4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2240,7 +2240,7 @@ 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 samples/bpf/ +%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ # Prevent bpf selftests to build bpftool repeatedly: export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool @@ -2957,8 +2957,17 @@ fi # # %changelog -* Thu Jul 29 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.0-0.rc3.20210728git4010a528219e.32] -- kernel-5.14.0-0.rc3.20210728git4010a528219e.32 (Fedora Kernel Team) +* Mon Aug 02 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.0-0.rc4.36] +- kernel-5.14.0-0.rc4.36 (Fedora Kernel Team) +- kernel-5.14.0-0.rc4.35 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210801gitf3438b4c4e69.34 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210731gitc7d102232649.33 (Fedora Kernel Team) +- x86: configs: Enable CONFIG_TEST_FPU for debug kernels (Vitaly Kuznetsov) [1988384] +- kernel-5.14.0-0.rc3.20210730git764a5bc89b12.32 (Fedora Kernel Team) +- redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] +- Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] +- kernel.spec: fix build of samples/bpf (Jiri Benc) +- Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] - kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) - kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) - Don't tag a release as [redhat] (Justin M. Forbes) @@ -2977,7 +2986,117 @@ fi - redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] - rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] -* Wed Jul 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc3.20210728git4010a528219e.32] +* Mon Aug 02 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc4.36] +- kernel-5.14.0-0.rc4.35 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210801gitf3438b4c4e69.34 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210731gitc7d102232649.33 (Fedora Kernel Team) +- x86: configs: Enable CONFIG_TEST_FPU for debug kernels (Vitaly Kuznetsov) [1988384] +- kernel-5.14.0-0.rc3.20210730git764a5bc89b12.32 (Fedora Kernel Team) +- redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] +- Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] +- kernel.spec: fix build of samples/bpf (Jiri Benc) +- Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] +- kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) +- Don't tag a release as [redhat] (Justin M. Forbes) +- Revert "Drop that for now" (Herton R. Krzesinski) +- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988] +- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert) +- fedora: sound config updates for 5.14 (Peter Robinson) +- fedora: Only enable FSI drivers on POWER platform (Peter Robinson) +- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson) +- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson) +- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson) +- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson) +- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson) +- fedora: arm: disabled unused FB drivers (Peter Robinson) +- fedora: don't enable FB_VIRTUAL (Peter Robinson) +- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] +- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] + +* Mon Aug 02 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc4.35] +- kernel-5.14.0-0.rc3.20210801gitf3438b4c4e69.34 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210731gitc7d102232649.33 (Fedora Kernel Team) +- x86: configs: Enable CONFIG_TEST_FPU for debug kernels (Vitaly Kuznetsov) [1988384] +- kernel-5.14.0-0.rc3.20210730git764a5bc89b12.32 (Fedora Kernel Team) +- redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] +- Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] +- kernel.spec: fix build of samples/bpf (Jiri Benc) +- Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] +- kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) +- Don't tag a release as [redhat] (Justin M. Forbes) +- Revert "Drop that for now" (Herton R. Krzesinski) +- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988] +- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert) +- fedora: sound config updates for 5.14 (Peter Robinson) +- fedora: Only enable FSI drivers on POWER platform (Peter Robinson) +- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson) +- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson) +- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson) +- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson) +- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson) +- fedora: arm: disabled unused FB drivers (Peter Robinson) +- fedora: don't enable FB_VIRTUAL (Peter Robinson) +- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] +- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] + +* Sun Aug 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc3.20210801gitf3438b4c4e69.34] +- kernel-5.14.0-0.rc3.20210731gitc7d102232649.33 (Fedora Kernel Team) +- x86: configs: Enable CONFIG_TEST_FPU for debug kernels (Vitaly Kuznetsov) [1988384] +- kernel-5.14.0-0.rc3.20210730git764a5bc89b12.32 (Fedora Kernel Team) +- redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] +- Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] +- kernel.spec: fix build of samples/bpf (Jiri Benc) +- Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] +- kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) +- Don't tag a release as [redhat] (Justin M. Forbes) +- Revert "Drop that for now" (Herton R. Krzesinski) +- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988] +- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert) +- fedora: sound config updates for 5.14 (Peter Robinson) +- fedora: Only enable FSI drivers on POWER platform (Peter Robinson) +- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson) +- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson) +- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson) +- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson) +- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson) +- fedora: arm: disabled unused FB drivers (Peter Robinson) +- fedora: don't enable FB_VIRTUAL (Peter Robinson) +- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] +- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] + +* Sat Jul 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc3.20210731gitc7d102232649.33] +- x86: configs: Enable CONFIG_TEST_FPU for debug kernels (Vitaly Kuznetsov) [1988384] +- kernel-5.14.0-0.rc3.20210730git764a5bc89b12.32 (Fedora Kernel Team) +- redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] +- Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] +- kernel.spec: fix build of samples/bpf (Jiri Benc) +- Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] +- kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) +- kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) +- Don't tag a release as [redhat] (Justin M. Forbes) +- Revert "Drop that for now" (Herton R. Krzesinski) +- rpmspec: switch iio and gpio tools to use tools_make (Herton R. Krzesinski) [1956988] +- configs/process_configs.sh: Handle config items with no help text (Patrick Talbert) +- fedora: sound config updates for 5.14 (Peter Robinson) +- fedora: Only enable FSI drivers on POWER platform (Peter Robinson) +- The CONFIG_RAW_DRIVER has been removed from upstream (Peter Robinson) +- fedora: updates for 5.14 with a few disables for common from pending (Peter Robinson) +- fedora: migrate from MFD_TPS68470 -> INTEL_SKL_INT3472 (Peter Robinson) +- fedora: Remove STAGING_GASKET_FRAMEWORK (Peter Robinson) +- Fedora: move DRM_VMWGFX configs from ark -> common (Peter Robinson) +- fedora: arm: disabled unused FB drivers (Peter Robinson) +- fedora: don't enable FB_VIRTUAL (Peter Robinson) +- redhat/configs: Double MAX_LOCKDEP_ENTRIES (Waiman Long) [1940075] +- rpmspec: fix verbose output on kernel-devel installation (Herton R. Krzesinski) [1981406] + +* Fri Jul 30 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc3.20210730git764a5bc89b12.32] +- redhat/configs: Move CHACHA and POLY1305 to core kernel to allow BIG_KEYS=y (root) [1983298] +- Revert "bpf: Add tech preview taint for syscall" (Jiri Olsa) [1978833] +- kernel.spec: fix build of samples/bpf (Jiri Benc) +- Enable OSNOISE_TRACER and TIMERLAT_TRACER (Jerome Marchand) [1979379] - kernel-5.14.0-0.rc3.20210728git4010a528219e.31 (Fedora Kernel Team) - kernel-5.14.0-0.rc3.20210728git7d549995d4e0.30 (Fedora Kernel Team) - Don't tag a release as [redhat] (Justin M. Forbes) diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch index d89148100..a2075fa77 100644 --- a/patch-5.14.0-redhat.patch +++ b/patch-5.14.0-redhat.patch @@ -55,7 +55,7 @@ include/linux/security.h | 5 + init/Kconfig | 2 +- kernel/Makefile | 1 + - kernel/bpf/syscall.c | 24 + + kernel/bpf/syscall.c | 18 + kernel/module.c | 2 + kernel/module_signing.c | 9 +- kernel/panic.c | 14 + @@ -81,7 +81,7 @@ tools/testing/selftests/bpf/progs/linked_maps2.c | 76 --- tools/testing/selftests/bpf/progs/linked_vars1.c | 54 -- tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- - 83 files changed, 1161 insertions(+), 1492 deletions(-) + 83 files changed, 1155 insertions(+), 1492 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index bdb22006f713..61a3a4a4730b 100644 @@ -137,7 +137,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 6b555f64df06..0a73a38e82b0 100644 +index 27a072cffcb9..1aee287a8f9c 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -167,10 +167,10 @@ index 6b555f64df06..0a73a38e82b0 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 82f908fa5676..6ffefb694a23 100644 +index 2fb7012c3246..47718b4f2f75 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1480,9 +1480,9 @@ config HIGHMEM +@@ -1474,9 +1474,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -2316,7 +2316,7 @@ index 4df609be42d0..4ef0c0f6a8f4 100644 obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c -index e343f158e556..840c5ecd4fc6 100644 +index e343f158e556..b2c979f9b80e 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -24,6 +24,7 @@ @@ -2351,24 +2351,6 @@ index e343f158e556..840c5ecd4fc6 100644 int sysctl_unprivileged_bpf_disabled __read_mostly = IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0; -@@ -4427,11 +4445,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr) - static int __sys_bpf(int cmd, bpfptr_t uattr, unsigned int size) - { - union bpf_attr attr; -+ static int marked; - int err; - - if (sysctl_unprivileged_bpf_disabled && !bpf_capable()) - return -EPERM; - -+ if (!marked) { -+ mark_tech_preview("eBPF syscall", NULL); -+ marked = true; -+ } -+ - err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size); - if (err) - return err; diff --git a/kernel/module.c b/kernel/module.c index ed13917ea5f3..88643913f3e4 100644 --- a/kernel/module.c @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.14.0-0.rc0.20210707git77d34a4683b0.12.tar.bz2) = 411f2a75d47633c61eb416d270a293d6965cf69b05fdada93480765da88185cea0378820f53b66fd405549374a5094868530f2451d1d2e6eda970afdc2d4bbb8 -SHA512 (linux-5.14-rc3-38-g4010a528219e.tar.xz) = 081f02fabb71612d794328168cea29c66520decc599ee9b838532086b6d58262ef8d279e98601bf264db299269f5c6b94d70bccc7c51df54c380a030b377ec40 -SHA512 (kernel-abi-stablelists-5.14.0-0.rc3.20210728git4010a528219e.32.tar.bz2) = 1225e16c535d8f9ddface62214cff21c6c92b534d8ade6b73c095e378d522540387047b90f6ca3cf48605f7e74c10620753e30ffb2cab2d3c00f20cc2c13c944 -SHA512 (kernel-kabi-dw-5.14.0-0.rc3.20210728git4010a528219e.32.tar.bz2) = bb5e0fc0fa760b290a20a706ae99f93b53085ca874fe2c5272f5bf94daf6fe68dd534bcdaea94ddffccd91258cb5c64ee77fb1930b239d53b413726511e634d0 +SHA512 (linux-5.14-rc4.tar.xz) = 008202c0cccd4040be8e2fdfb69e629213a47f9d15709a2a180051cbf844027d95d49b800199fb9508a596ebdaf881402319ff32febf664f9f0c2ce30fe79215 +SHA512 (kernel-abi-stablelists-5.14.0-0.rc4.36.tar.bz2) = c04503df2c81d8922a8ec605c3071aa32b93df405e6769212326ef9e060917beda4b4ddc33476023bd3beca64e5243b601037cb6a0c188b3e70eacfe1734b078 +SHA512 (kernel-kabi-dw-5.14.0-0.rc4.36.tar.bz2) = 89fa2e472c95500675b88ed02b92a842b622082d065029cf617107133e5bbe88d0f92be9055b713bb99370fe6e39568fc982f971d32a0d034635ea26ddd7e13b |