From 4b9d96346f0fe90c65c0c23d0a3aa4ef19e596e4 Mon Sep 17 00:00:00 2001
From: "Herton R. Krzesinski" <herton@redhat.com>
Date: Wed, 2 Jun 2021 15:24:51 -0400
Subject: [PATCH] kernel-5.13.0-0.rc4.33.el9

* Wed Jun 02 2021 Herton R. Krzesinski <herton@redhat.com> [5.13.0-0.rc4.33]
- v5.13-rc4-48-g231bc5390667 rebase [1962878]
- bpf: Fix unprivileged_bpf_disabled setup (Jiri Olsa)
- Enable CONFIG_BPF_UNPRIV_DEFAULT_OFF (Jiri Olsa)
- [redhat] configs: Enable CONFIG_VIRTIO_FS on s390x, too (Thomas Huth) [1871130]
- configs/common/s390: disable CONFIG_QETH_{OSN,OSX} (Philipp Rudo) [1903201]
- nvme: nvme_mpath_init remove multipath check (Mike Snitzer) [1948690]
- [redhat] Flip some diag modules from m to y (Antoine Tenart) [1948340]
- team: mark team driver as deprecated (Hangbin Liu) [1945477]
- [redhat] perf: link libtraceevent dynamically (Michael Petlan) [1952426]
- Make CRYPTO_EC also builtin (Simo Sorce) [1947240]
- Do not hard-code a default value for DIST (David Ward)
Resolves: rhbz#1947240, rhbz#1952426, rhbz#1945477, rhbz#1948340, rhbz#1948690, rhbz#1903201, rhbz#1871130, rhbz#1962878

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
---
 Makefile.rhelver                        |  2 +-
 Patchlist.changelog                     |  9 ++++++
 kernel-aarch64-debug-fedora.config      | 20 +++++++-----
 kernel-aarch64-debug-rhel.config        | 20 +++++++-----
 kernel-aarch64-fedora.config            | 20 +++++++-----
 kernel-aarch64-rhel.config              | 20 +++++++-----
 kernel-armv7hl-debug-fedora.config      | 20 +++++++-----
 kernel-armv7hl-fedora.config            | 20 +++++++-----
 kernel-armv7hl-lpae-debug-fedora.config | 20 +++++++-----
 kernel-armv7hl-lpae-fedora.config       | 20 +++++++-----
 kernel-i686-debug-fedora.config         | 20 +++++++-----
 kernel-i686-fedora.config               | 20 +++++++-----
 kernel-ppc64le-debug-fedora.config      | 20 +++++++-----
 kernel-ppc64le-debug-rhel.config        | 22 +++++++------
 kernel-ppc64le-fedora.config            | 20 +++++++-----
 kernel-ppc64le-rhel.config              | 22 +++++++------
 kernel-s390x-debug-fedora.config        | 24 +++++++++------
 kernel-s390x-debug-rhel.config          | 26 +++++++++-------
 kernel-s390x-fedora.config              | 24 +++++++++------
 kernel-s390x-rhel.config                | 26 +++++++++-------
 kernel-s390x-zfcpdump-rhel.config       | 22 +++++++------
 kernel-x86_64-debug-fedora.config       | 20 +++++++-----
 kernel-x86_64-debug-rhel.config         | 22 +++++++------
 kernel-x86_64-fedora.config             | 20 +++++++-----
 kernel-x86_64-rhel.config               | 22 +++++++------
 kernel.spec                             | 41 +++++++++++++++++--------
 sources                                 |  6 ++--
 27 files changed, 333 insertions(+), 215 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index a8e2c9884..b0395e046 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 = 25
+RHEL_RELEASE = 33
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 8ebcdbdd0..39435dd3f 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,9 +1,18 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/9ecb01bae94e7379d2da1b5e375241ea3b40ff3b
+ 9ecb01bae94e7379d2da1b5e375241ea3b40ff3b bpf: Fix unprivileged_bpf_disabled setup
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/217f590d1ac59c7253497adb15c8a81d59b8be95
+ 217f590d1ac59c7253497adb15c8a81d59b8be95 nvme: nvme_mpath_init remove multipath check
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/3b0b403f2c1261ea8e4ab576e5a44664a7abd12c
  3b0b403f2c1261ea8e4ab576e5a44664a7abd12c mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos
 
 https://gitlab.com/cki-project/kernel-ark/-/commit/42fcca9ea8f8acd6f561e9589f92462246e572ff
  42fcca9ea8f8acd6f561e9589f92462246e572ff Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled"
 
+https://gitlab.com/cki-project/kernel-ark/-/commit/043900845a208ff1fd0ba71ad9c0f4da17c59243
+ 043900845a208ff1fd0ba71ad9c0f4da17c59243 team: mark team driver as deprecated
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/81cf9b7d49bb0a3786746e73d3090d97cefe301e
  81cf9b7d49bb0a3786746e73d3090d97cefe301e nvme: multipath: Change default of kernel NVMe multipath to be disabled
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index d2bf59612..dfef7081d 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -757,6 +757,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1362,7 +1363,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2519,6 +2520,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2864,15 +2866,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4465,7 +4468,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4908,7 +4911,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -7208,6 +7211,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -7588,7 +7592,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 60cae73e0..15d0e9cd3 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -541,6 +541,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BQL=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -991,7 +992,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_ECDH is not set
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1964,6 +1965,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 CONFIG_HID_SENSOR_HUB=m
@@ -2245,15 +2247,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -3556,7 +3559,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3950,7 +3953,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 CONFIG_PAGE_EXTENSION=y
@@ -5660,6 +5663,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5974,7 +5978,7 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index bba1b07dd..f77e2bc19 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -757,6 +757,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1362,7 +1363,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2503,6 +2504,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2848,15 +2850,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4442,7 +4445,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4885,7 +4888,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -7183,6 +7186,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -7563,7 +7567,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index fb1503359..bb0e90d99 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -541,6 +541,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BQL=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -991,7 +992,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_ECDH is not set
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1948,6 +1949,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 CONFIG_HID_SENSOR_HUB=m
@@ -2229,15 +2231,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -3536,7 +3539,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3930,7 +3933,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 # CONFIG_PAGE_EXTENSION is not set
@@ -5637,6 +5640,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5951,7 +5955,7 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 884686abd..24643d162 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -783,6 +783,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1364,7 +1365,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2548,6 +2549,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2890,15 +2892,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4547,7 +4550,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -5017,7 +5020,7 @@ CONFIG_P54_PCI=m
 CONFIG_P54_SPI=m
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -7432,6 +7435,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -7834,7 +7838,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 228ea31fe..c268cddbf 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -783,6 +783,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1364,7 +1365,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2533,6 +2534,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2875,15 +2877,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4525,7 +4528,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4995,7 +4998,7 @@ CONFIG_P54_PCI=m
 CONFIG_P54_SPI=m
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -7408,6 +7411,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -7810,7 +7814,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index de04fc4af..8fb4d65bc 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -761,6 +761,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1334,7 +1335,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2494,6 +2495,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2832,15 +2834,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4444,7 +4447,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4903,7 +4906,7 @@ CONFIG_P54_PCI=m
 CONFIG_P54_SPI=m
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -7190,6 +7193,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -7586,7 +7590,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index ad516fbb7..b2ff1f99b 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -761,6 +761,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1334,7 +1335,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2479,6 +2480,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2817,15 +2819,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4422,7 +4425,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4881,7 +4884,7 @@ CONFIG_P54_PCI=m
 CONFIG_P54_SPI=m
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -7166,6 +7169,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -7562,7 +7566,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 692c88ea0..abe6be33f 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -595,6 +595,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1077,7 +1078,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2183,6 +2184,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2504,15 +2506,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4069,7 +4072,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4489,7 +4492,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -6472,6 +6475,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6834,7 +6838,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index fa3eda9eb..d09e60600 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -594,6 +594,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1076,7 +1077,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2166,6 +2167,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2487,15 +2489,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -4047,7 +4050,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4467,7 +4470,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -6448,6 +6451,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6810,7 +6814,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 05bfd1cb4..ab4579618 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -555,6 +555,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1016,7 +1017,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2035,6 +2036,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2330,15 +2332,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3797,7 +3800,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4212,7 +4215,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -6071,6 +6074,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6420,7 +6424,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 969a74d88..77fc38c0f 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -430,6 +430,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -848,8 +849,8 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1814,6 +1815,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2088,15 +2090,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -3394,7 +3397,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3780,7 +3783,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 CONFIG_PAGE_EXTENSION=y
@@ -5464,6 +5467,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5780,7 +5784,7 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index b8f69086d..b1eaa6245 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -554,6 +554,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1015,7 +1016,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2018,6 +2019,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2313,15 +2315,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3774,7 +3777,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4189,7 +4192,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -6046,6 +6049,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6395,7 +6399,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index f5e8c79c1..036f9a0fc 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -430,6 +430,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -848,8 +849,8 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1798,6 +1799,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2072,15 +2074,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -3377,7 +3380,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3763,7 +3766,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 # CONFIG_PAGE_EXTENSION is not set
@@ -5445,6 +5448,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5761,7 +5765,7 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 9890eee7f..4662b8e5b 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -559,6 +559,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1017,7 +1018,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2033,6 +2034,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2311,15 +2313,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3771,7 +3774,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4179,7 +4182,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
@@ -4552,8 +4555,8 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
 CONFIG_QETH=m
-CONFIG_QETH_OSN=y
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSN is not set
+# CONFIG_QETH_OSX is not set
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QLA3XXX=m
@@ -6009,6 +6012,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6363,7 +6367,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 1449cea1c..0809e3434 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -430,6 +430,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -847,7 +848,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_ECDH is not set
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1813,6 +1814,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2069,15 +2071,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3372,7 +3375,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3757,7 +3760,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 CONFIG_PACK_STACK=y
@@ -4102,8 +4105,8 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
 CONFIG_QETH=m
-CONFIG_QETH_OSN=y
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSN is not set
+# CONFIG_QETH_OSX is not set
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QLA3XXX=m
@@ -5406,6 +5409,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5735,7 +5739,7 @@ CONFIG_UHID=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -6219,7 +6223,7 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=y
-# CONFIG_VIRTIO_FS is not set
+CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MENU=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 195517bba..ad59ac786 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -558,6 +558,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1016,7 +1017,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2016,6 +2017,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2294,15 +2296,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3748,7 +3751,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4156,7 +4159,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 CONFIG_PACK_STACK=y
@@ -4529,8 +4532,8 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
 CONFIG_QETH=m
-CONFIG_QETH_OSN=y
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSN is not set
+# CONFIG_QETH_OSX is not set
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QLA3XXX=m
@@ -5984,6 +5987,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6338,7 +6342,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 38423903b..d01f5ca38 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -430,6 +430,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -847,7 +848,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_ECDH is not set
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1797,6 +1798,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2053,15 +2055,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
@@ -3355,7 +3358,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3740,7 +3743,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 CONFIG_PACK_STACK=y
@@ -4085,8 +4088,8 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
 CONFIG_QETH=m
-CONFIG_QETH_OSN=y
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSN is not set
+# CONFIG_QETH_OSX is not set
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QLA3XXX=m
@@ -5387,6 +5390,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5716,7 +5720,7 @@ CONFIG_UHID=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -6200,7 +6204,7 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
 CONFIG_VIRTIO_CONSOLE=y
-# CONFIG_VIRTIO_FS is not set
+CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MENU=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index c65bc0995..cf76299a7 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -434,6 +434,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 # CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -1810,6 +1811,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2067,16 +2069,17 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 # CONFIG_INET is not set
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 # CONFIG_INFINIBAND_BNXT_RE is not set
 CONFIG_INFINIBAND_CXGB4=m
@@ -3762,7 +3765,7 @@ CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 # CONFIG_PACKET is not set
 # CONFIG_PACKING is not set
 CONFIG_PACK_STACK=y
@@ -4108,8 +4111,8 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
 CONFIG_QETH=m
-CONFIG_QETH_OSN=y
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSN is not set
+# CONFIG_QETH_OSX is not set
 # CONFIG_QFMT_V1 is not set
 CONFIG_QFMT_V2=y
 CONFIG_QLA3XXX=m
@@ -5420,6 +5423,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -5750,7 +5754,7 @@ CONFIG_UHID=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 # CONFIG_UNIX is not set
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -6234,7 +6238,7 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_VIRTIO_CONSOLE is not set
-# CONFIG_VIRTIO_FS is not set
+CONFIG_VIRTIO_FS=m
 CONFIG_VIRTIO_INPUT=m
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTIO_MENU=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 90e95b3ed..b2bb3348e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -604,6 +604,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1106,7 +1107,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2223,6 +2224,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2548,15 +2550,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -4110,7 +4113,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4537,7 +4540,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -6526,6 +6529,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6887,7 +6891,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 4a6a3c6c7..6f5b45095 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -457,6 +457,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -900,8 +901,8 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1931,6 +1932,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
@@ -2232,15 +2234,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -3584,7 +3587,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3971,7 +3974,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 CONFIG_PAGE_EXTENSION=y
@@ -5697,6 +5700,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6022,7 +6026,7 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index aab92a6be..a2d52f6f6 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -603,6 +603,7 @@ CONFIG_BPF_PRELOAD_UMD=m
 CONFIG_BPF_PRELOAD=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
@@ -1105,7 +1106,7 @@ CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDH=y
 # CONFIG_CRYPTO_ECDSA is not set
 CONFIG_CRYPTO_ECHAINIV=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -2206,6 +2207,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE=m
@@ -2531,15 +2533,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 CONFIG_INET_DIAG_DESTROY=y
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -4088,7 +4091,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_NCSI=y
 CONFIG_NET_NSH=m
@@ -4515,7 +4518,7 @@ CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_USB=m
 CONFIG_PA12203001=m
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 CONFIG_PACKING=y
 # CONFIG_PAGE_EXTENSION is not set
@@ -6502,6 +6505,7 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6863,7 +6867,7 @@ CONFIG_UNICODE=y
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 CONFIG_UNUSED_SYMBOLS=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 11d015233..6251ce73d 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -457,6 +457,7 @@ CONFIG_BPF_LSM=y
 # CONFIG_BPF_PRELOAD is not set
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
@@ -900,8 +901,8 @@ CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ECDH=m
-CONFIG_CRYPTO_ECDSA=m
+CONFIG_CRYPTO_ECDH=y
+CONFIG_CRYPTO_ECDSA=y
 CONFIG_CRYPTO_ECHAINIV=m
 # CONFIG_CRYPTO_ECRDSA is not set
 CONFIG_CRYPTO_ESSIV=m
@@ -1915,6 +1916,7 @@ CONFIG_HID_RMI=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_HID_SENSOR_ALS=m
 # CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
@@ -2216,15 +2218,16 @@ CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_INET_AH=m
 # CONFIG_INET_DIAG_DESTROY is not set
-CONFIG_INET_DIAG=m
+CONFIG_INET_DIAG=y
 CONFIG_INET_ESPINTCP=y
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
-CONFIG_INET_MPTCP_DIAG=m
-CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_MPTCP_DIAG=y
+CONFIG_INET_RAW_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_UDP_DIAG=y
 CONFIG_INET=y
 CONFIG_INFINIBAND_ADDR_TRANS=y
 CONFIG_INFINIBAND_BNXT_RE=m
@@ -3565,7 +3568,7 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
-CONFIG_NETLINK_DIAG=m
+CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
@@ -3952,7 +3955,7 @@ CONFIG_OVERLAY_FS=m
 # CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
 # CONFIG_OVERLAY_FS_XINO_AUTO is not set
 # CONFIG_PA12203001 is not set
-CONFIG_PACKET_DIAG=m
+CONFIG_PACKET_DIAG=y
 CONFIG_PACKET=y
 # CONFIG_PACKING is not set
 # CONFIG_PAGE_EXTENSION is not set
@@ -5675,6 +5678,7 @@ CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
 # CONFIG_SYSTEMPORT is not set
+# CONFIG_SYSTEM_REVOCATION_KEYS is not set
 # CONFIG_SYSTEM_REVOCATION_LIST is not set
 CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_TRUSTED_KEYS=""
@@ -6000,7 +6004,7 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UNISYSSPAR is not set
 # CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX_DIAG=m
+CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_UNIX=y
 # CONFIG_UNUSED_SYMBOLS is not set
diff --git a/kernel.spec b/kernel.spec
index 2be4f3da7..84fde9795 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 0.rc3.25
+%global distro_build 0.rc4.33
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -117,13 +117,13 @@ Summary: The Linux kernel
 %define kversion 5.13
 
 %define rpmversion 5.13.0
-%define pkgrelease 0.rc3.25
+%define pkgrelease 0.rc4.33
 
 # This is needed to do merge window version magic
 %define patchlevel 13
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.25%{?buildid}%{?dist}
+%define specrelease 0.rc4.33%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -546,6 +546,7 @@ BuildRequires: audit-libs-devel
 BuildRequires: java-devel
 BuildRequires: libbpf-devel
 BuildRequires: libbabeltrace-devel
+BuildRequires: libtraceevent-devel
 %ifnarch %{arm} s390x
 BuildRequires: numactl-devel
 %endif
@@ -623,7 +624,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13.0-0.rc3.25.tar.xz
+Source0: linux-5.13.0-0.rc4.33.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -875,7 +876,7 @@ This package provides debug information for the perf package.
 # symlinks because of the trailing nonmatching alternation and
 # the leading .*, because of find-debuginfo.sh's buggy handling
 # of matching the pattern against the symlinks file.
-%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/traceevent/plugins/.*|.*%%{_libdir}/libperf-jvmti.so(\.debug)?|XXX' -o perf-debuginfo.list}
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/libperf-jvmti.so(\.debug)?|XXX' -o perf-debuginfo.list}
 
 %package -n python3-perf
 Summary: Python bindings for apps which will manipulate perf events
@@ -1292,8 +1293,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.13.0-0.rc3.25 -c
-mv linux-5.13.0-0.rc3.25 linux-%{KVERREL}
+%setup -q -n kernel-5.13.0-0.rc4.33 -c
+mv linux-5.13.0-0.rc4.33 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2073,7 +2074,7 @@ InitBuildVars
 %endif
 
 %global perf_make \
-  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 prefix=%{_prefix} PYTHON=%{__python3}
+  %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 prefix=%{_prefix} PYTHON=%{__python3}
 %if %{with_perf}
 # perf
 # make sure check-headers.sh is executable
@@ -2286,7 +2287,7 @@ tar xjvf %{SOURCE300} -C $INSTALL_KABI_PATH
 
 %if %{with_perf}
 # perf tool binary and supporting scripts/binaries
-%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin install-traceevent-plugins
+%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin
 # remove the 'trace' symlink.
 rm -f %{buildroot}%{_bindir}/trace
 
@@ -2594,8 +2595,7 @@ fi
 %files -n perf
 %{_bindir}/perf
 %{_libdir}/libperf-jvmti.so
-%dir %{_libdir}/traceevent/plugins
-%{_libdir}/traceevent/plugins/*
+%exclude %{_libdir}/traceevent
 %dir %{_libexecdir}/perf-core
 %{_libexecdir}/perf-core/*
 %{_datadir}/perf-core/*
@@ -2795,8 +2795,25 @@ fi
 #
 #
 %changelog
+* Wed Jun 02 2021 Herton R. Krzesinski <herton@redhat.com> [5.13.0-0.rc4.33]
+- v5.13-rc4-48-g231bc5390667 rebase [1962878]
+- bpf: Fix unprivileged_bpf_disabled setup (Jiri Olsa)
+- Enable CONFIG_BPF_UNPRIV_DEFAULT_OFF (Jiri Olsa)
+
+* Tue Jun 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.20210601gitc2131f7e73c9.32]
+- configs/common/s390: disable CONFIG_QETH_{OSN,OSX} (Philipp Rudo) [1903201]
+
+* Fri May 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210528git97e5bf604b7a.28]
+- nvme: nvme_mpath_init remove multipath check (Mike Snitzer)
+
+* Wed May 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210526gitad9f25d33860.27]
+- team: mark team driver as deprecated (Hangbin Liu) [1945477]
+
+* Tue May 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210525gita050a6d2b7e8.26]
+- Make CRYPTO_EC also builtin (Simo Sorce) [1947240]
+- Do not hard-code a default value for DIST (David Ward)
+
 * Mon May 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.25]
-- v5.13-rc3 rebase
 - Override %%{debugbuildsenabled} if the --with-release option is used (David Ward)
 - Improve comments in SPEC file, and move some option tests and macros (David Ward)
 
diff --git a/sources b/sources
index 55b5fb715..127e2b29c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13.0-0.rc3.25.tar.xz) = f3a3603de17346d23312007ec7792b0419a9022ab540f01de1cd568e9640fd6936697733a58bbd50d1631f0fc0eb8c08540cfb9eecbcad640a1bc2ca0deb90df
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.25.tar.bz2) = 6351d433840b94ba5675e120065160f0bd7fbe41b6aa526236622215376fb37d3158a8f4087fd0ba4f438642cabbebe0f9a142ce75bc0777493efe7ee927a58f
-SHA512 (kernel-kabi-dw-5.13.0-0.rc3.25.tar.bz2) = f1e76c4da76ad443e171b34c9d03b99c9cd1a5d9bf5a45aced8d8857db9897c8eb66100bc61c45ba01058f7d3f5a9d3b8763d21fe22f0013970480f9095f6383
+SHA512 (linux-5.13.0-0.rc4.33.tar.xz) = 40b1ad5e645a46dac949db03940075bb99803b8d8f8e1636565a622a26775b0deb356234ca31f1af46671e7c5046ec2db37c0e5e87578964b3dbbf2159ca8d14
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc4.33.tar.bz2) = 2bffbc5f671051f3098310798eade6eb9d3689db5aa9afb385c05ea760c61532dc514509d64f15449bab649a0a2bb9cbbaad19a035f818ba533e15679e9a45b8
+SHA512 (kernel-kabi-dw-5.13.0-0.rc4.33.tar.bz2) = 2152bbf97d61a4f197740371024177570ee31873bd46e9cae2f571ef0e01b31ccd2b982a1a79b14b6788fbd87d12135df3a5209c3f8b789b255f63ed403021db