summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-05-31 10:18:31 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-05-31 10:18:31 -0500
commit1dfb87c0ec1f644cbb69740c8be485f6f9906d75 (patch)
tree3e09eff92277dca8dbaf15b0006031397f7f33c8
parenta258481f4d957268f79e4a9efba6e5833c1c715d (diff)
downloadkernel-1dfb87c0ec1f644cbb69740c8be485f6f9906d75.tar.gz
kernel-1dfb87c0ec1f644cbb69740c8be485f6f9906d75.tar.xz
kernel-1dfb87c0ec1f644cbb69740c8be485f6f9906d75.zip
kernel-5.13.0-0.rc4.32
* Mon May 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.32] - spec: Enable sefltests rpm build (Jiri Olsa) - spec: Allow bpf selftest/samples to fail (Jiri Olsa) - kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc) - kernel.spec: Add missing source files to kernel-selftests-internal (Jiri Benc) - kernel.spec: selftests: add net/forwarding to TARGETS list (Jiri Benc) - kernel.spec: selftests: add build requirement on libmnl-devel (Jiri Benc) - kernel.spec: add action.o to kernel-selftests-internal (Jiri Benc) - kernel.spec: avoid building bpftool repeatedly (Jiri Benc) - kernel.spec: selftests require python3 (Jiri Benc) - kernel.spec: skip selftests that failed to build (Jiri Benc) - kernel.spec: fix installation of bpf selftests (Jiri Benc) - redhat: fix samples and selftests make options (Jiri Benc) - kernel.spec: enable mptcp selftests for kernel-selftests-internal (Jiri Benc) - kernel.spec: Do not export shared objects from libexecdir to RPM Provides (Jiri Benc) - kernel.spec: add missing dependency for the which package (Jiri Benc) - kernel.spec: add netfilter selftests to kernel-selftests-internal (Jiri Benc) - kernel.spec: move slabinfo and page_owner_sort debuginfo to tools-debuginfo (Jiri Benc) - kernel.spec: package and ship VM tools (Jiri Benc) - configs: enable CONFIG_PAGE_OWNER (Jiri Benc) - kernel.spec: add coreutils (Jiri Benc) - kernel.spec: add netdevsim driver selftests to kernel-selftests-internal (Jiri Benc) - redhat/Makefile: Clean out the --without flags from the baseonly rule (Jiri Benc) - kernel.spec: Stop building unnecessary rpms for baseonly builds (Jiri Benc) - kernel.spec: disable more kabi switches for gcov build (Jiri Benc) - kernel.spec: Rename kabi-dw base (Jiri Benc) - kernel.spec: Fix error messages during build of zfcpdump kernel (Jiri Benc) - kernel.spec: perf: remove bpf examples (Jiri Benc) - kernel.spec: selftests should not depend on modules-internal (Jiri Benc) - kernel.spec: build samples (Jiri Benc) - kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog3
-rw-r--r--kernel-aarch64-debug-fedora.config17
-rw-r--r--kernel-aarch64-debug-rhel.config17
-rw-r--r--kernel-aarch64-fedora.config17
-rw-r--r--kernel-aarch64-rhel.config17
-rw-r--r--kernel-armv7hl-debug-fedora.config17
-rw-r--r--kernel-armv7hl-fedora.config17
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config17
-rw-r--r--kernel-armv7hl-lpae-fedora.config17
-rw-r--r--kernel-i686-debug-fedora.config17
-rw-r--r--kernel-i686-fedora.config17
-rw-r--r--kernel-ppc64le-debug-fedora.config17
-rw-r--r--kernel-ppc64le-debug-rhel.config17
-rw-r--r--kernel-ppc64le-fedora.config17
-rw-r--r--kernel-ppc64le-rhel.config17
-rw-r--r--kernel-s390x-debug-fedora.config17
-rw-r--r--kernel-s390x-debug-rhel.config17
-rw-r--r--kernel-s390x-fedora.config17
-rw-r--r--kernel-s390x-rhel.config17
-rw-r--r--kernel-s390x-zfcpdump-rhel.config15
-rw-r--r--kernel-x86_64-debug-fedora.config17
-rw-r--r--kernel-x86_64-debug-rhel.config17
-rw-r--r--kernel-x86_64-fedora.config17
-rw-r--r--kernel-x86_64-rhel.config17
-rwxr-xr-xkernel.spec19
-rw-r--r--patch-5.13.0-redhat.patch38
-rw-r--r--sources6
28 files changed, 271 insertions, 186 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 6dfa72552..28ddeb911 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 = 28
+RHEL_RELEASE = 32
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 2f587dd21..f6b0a683d 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+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
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 42ec36461..1b99e1b00 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2864,15 +2865,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 +4467,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 +4910,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=y
@@ -7208,6 +7210,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 +7591,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 0f3dd280a..9e0151f4d 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 is not set
CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2245,15 +2246,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 +3558,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 +3952,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 +5662,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 +5977,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 decf19fac..1632cd3c4 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2848,15 +2849,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 +4444,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 +4887,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=y
@@ -7183,6 +7185,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 +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-aarch64-rhel.config b/kernel-aarch64-rhel.config
index f9726ada4..4424b0307 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 is not set
CONFIG_BQL=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2229,15 +2230,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 +3538,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 +3932,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
@@ -5637,6 +5639,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 +5954,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 b303106b9..ad58e561b 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2890,15 +2891,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 +4549,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 +5019,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=y
@@ -7432,6 +7434,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 +7837,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 c2f9fcdc8..196a17da3 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2875,15 +2876,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 +4527,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 +4997,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=y
@@ -7408,6 +7410,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 +7813,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 462a1992e..aee121bd5 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2832,15 +2833,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 +4446,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 +4905,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=y
@@ -7190,6 +7192,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 +7589,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 9e2ac6423..5e0a0297a 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2817,15 +2818,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 +4424,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 +4883,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=y
@@ -7166,6 +7168,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 +7565,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 73f52e1f4..9b85682b5 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2504,15 +2505,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 +4071,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 +4491,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=y
@@ -6472,6 +6474,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 +6837,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 d47987b81..477ea6437 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2487,15 +2488,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 +4049,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 +4469,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=y
@@ -6448,6 +6450,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 +6813,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 772afbcc2..5f150f4dc 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2330,15 +2331,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 +3799,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 +4214,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=y
@@ -6071,6 +6073,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 +6423,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 16215f99c..0602beb79 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2088,15 +2089,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 +3396,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 +3782,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 +5466,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 +5783,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 d25432dab..6f6344be9 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2313,15 +2314,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 +3776,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 +4191,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=y
@@ -6046,6 +6048,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 +6398,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 bf43d04da..30d63b698 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2072,15 +2073,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 +3379,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 +3765,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
@@ -5445,6 +5447,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 +5764,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 e49e80164..a1f9ab49d 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2311,15 +2312,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 +3773,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 +4181,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
@@ -6009,6 +6011,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 +6366,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 46916ad18..00dcbd57d 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2069,15 +2070,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 +3374,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 +3759,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
@@ -5406,6 +5408,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 +5738,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
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 913d39b79..2b917f5eb 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2294,15 +2295,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 +3750,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 +4158,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
@@ -5984,6 +5986,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 +6341,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 7057a97bd..5aee0ae1c 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2053,15 +2054,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 +3357,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 +3742,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
@@ -5387,6 +5389,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 +5719,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
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index c65bc0995..22adcac71 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2067,16 +2068,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 +3764,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
@@ -5420,6 +5422,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 +5753,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
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index befaa84e7..94d7f7848 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2548,15 +2549,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 +4112,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 +4539,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=y
@@ -6526,6 +6528,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 +6890,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 2263bf2e1..10c740ed5 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2232,15 +2233,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 +3586,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 +3973,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 +5699,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 +6025,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 1ae2e81d8..db0dba0db 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 is not set
CONFIG_BPQETHER=m
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
@@ -2531,15 +2532,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 +4090,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 +4517,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=y
@@ -6502,6 +6504,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 +6866,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 af003f06c..5d2fba9c6 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 is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMDBG is not set
CONFIG_BRCMFMAC=m
@@ -2216,15 +2217,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 +3567,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 +3954,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
@@ -5675,6 +5677,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 +6003,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 8abc8b9dd..5deafb1c2 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
-%global distro_build 0.rc3.20210527gitad9f25d33860.28
+%global distro_build 0.rc4.32
%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.20210527gitad9f25d33860.28
+%define pkgrelease 0.rc4.32
# This is needed to do merge window version magic
%define patchlevel 13
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20210527gitad9f25d33860.28%{?buildid}%{?dist}
+%define specrelease 0.rc4.32%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -647,7 +647,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc3-43-gad9f25d33860.tar.xz
+Source0: linux-5.13-rc4.tar.xz
Source1: Makefile.rhelver
@@ -1316,8 +1316,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.13-rc3-43-gad9f25d33860 -c
-mv linux-5.13-rc3-43-gad9f25d33860 linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc4 -c
+mv linux-5.13-rc4 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2871,7 +2871,7 @@ fi
#
#
%changelog
-* Thu May 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210527gitad9f25d33860.28]
+* Mon May 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc4.32]
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
@@ -2903,6 +2903,9 @@ fi
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
+* 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]
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch
index 8c9edddb3..3d3d7908c 100644
--- a/patch-5.13.0-redhat.patch
+++ b/patch-5.13.0-redhat.patch
@@ -31,7 +31,7 @@
drivers/net/team/team.c | 2 +
drivers/net/wireguard/main.c | 7 +
drivers/nvme/host/core.c | 22 +-
- drivers/nvme/host/multipath.c | 16 +-
+ drivers/nvme/host/multipath.c | 19 +-
drivers/nvme/host/nvme.h | 4 +
drivers/pci/pci-driver.c | 29 ++
drivers/pci/quirks.c | 24 ++
@@ -55,7 +55,7 @@
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
kernel/Makefile | 1 +
- kernel/bpf/syscall.c | 27 +-
+ kernel/bpf/syscall.c | 27 ++
kernel/crash_core.c | 28 +-
kernel/module.c | 2 +
kernel/module_signing.c | 9 +-
@@ -68,7 +68,7 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 70 files changed, 1209 insertions(+), 187 deletions(-)
+ 70 files changed, 1211 insertions(+), 188 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -145,7 +145,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index e4468353425a..95ea0abae436 100644
+index b79e0e8acbe3..4968f750ae2e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -167,7 +167,7 @@ index e4468353425a..95ea0abae436 100644
-Werror=return-type -Wno-format-security \
-std=gnu89
KBUILD_CPPFLAGS := -D__KERNEL__
-@@ -1291,7 +1296,13 @@ define filechk_version.h
+@@ -1296,7 +1301,13 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
@@ -472,7 +472,7 @@ index c68e694fca26..146cba5ae5bc 100644
return ctx.rc;
}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 453eff8ec8c3..7a60a5d6f9ab 100644
+index e10d38ac7cf2..684b241e89e9 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1641,6 +1641,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
@@ -1306,7 +1306,7 @@ index 7a7d5f1a80fc..de28e2633761 100644
err_netlink:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 762125f2905f..02aaa0a23e4b 100644
+index 66973bb56305..fcfc2aa3124c 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -241,6 +241,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1373,7 +1373,7 @@ index 762125f2905f..02aaa0a23e4b 100644
}
EXPORT_SYMBOL_GPL(nvme_complete_rq);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index f81871c7128a..6c4cc5e9be60 100644
+index f81871c7128a..763ed40d50fe 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
@@ -1409,6 +1409,16 @@ index f81871c7128a..6c4cc5e9be60 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next)
+@@ -795,8 +801,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+ int error = 0;
+
+ /* check if multipath is enabled and we have the capability */
+- if (!multipath || !ctrl->subsys ||
+- !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
++ if (!ctrl->subsys || !(ctrl->subsys->cmic & NVME_CTRL_CMIC_ANA))
+ return 0;
+
+ ctrl->anacap = id->anacap;
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 0015860ec12b..25acc9943007 100644
--- a/drivers/nvme/host/nvme.h
@@ -2339,7 +2349,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 941ca06d9dfa..8231bd05d0ea 100644
+index ea04b0deb5ce..88925c1887b7 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@
@@ -2350,11 +2360,10 @@ index 941ca06d9dfa..8231bd05d0ea 100644
#include <uapi/linux/btf.h>
#include <linux/pgtable.h>
#include <linux/bpf_lsm.h>
-@@ -50,7 +51,25 @@ static DEFINE_SPINLOCK(map_idr_lock);
+@@ -50,6 +51,26 @@ static DEFINE_SPINLOCK(map_idr_lock);
static DEFINE_IDR(link_idr);
static DEFINE_SPINLOCK(link_idr_lock);
--int sysctl_unprivileged_bpf_disabled __read_mostly;
+/* RHEL-only: default to 1 */
+int sysctl_unprivileged_bpf_disabled __read_mostly = 1;
+
@@ -2374,10 +2383,11 @@ index 941ca06d9dfa..8231bd05d0ea 100644
+ return 1;
+}
+__setup("unprivileged_bpf_disabled=", unprivileged_bpf_setup);
++
+ int sysctl_unprivileged_bpf_disabled __read_mostly =
+ IS_BUILTIN(CONFIG_BPF_UNPRIV_DEFAULT_OFF) ? 2 : 0;
- static const struct bpf_map_ops * const bpf_map_types[] = {
- #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
-@@ -4368,11 +4387,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
+@@ -4369,11 +4390,17 @@ static int bpf_prog_bind_map(union bpf_attr *attr)
SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
{
union bpf_attr attr;
diff --git a/sources b/sources
index 9e4a9cdf4..2960d8d46 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13-rc3-43-gad9f25d33860.tar.xz) = e77a1a9882ad788edde989734b48cc74979f495d6e15bd2d3bdd35a63f1cbc326a9b88e4485268e8fe599199c641c3ebaa96611a8fdde7b0613dd2181e20fcb6
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.20210527gitad9f25d33860.28.tar.bz2) = 98e2486ee10c067ca4926f9099673ac89de5504dbeba372f48012ff8be25bcd869ca628969f9d82c315ef6b0b03b0442008b52d499fbf9502606d5dd78be510a
-SHA512 (kernel-kabi-dw-5.13.0-0.rc3.20210527gitad9f25d33860.28.tar.bz2) = 2d556aef9e0a530069bfca1cb12d7d4070f5dc47d0417e4b5a214dc63c4f8b4d0186944ef28515ea5555ea22a43cba00e53698e924f33302c83b44387e2407c1
+SHA512 (linux-5.13-rc4.tar.xz) = 006e5424a7b215277536eb596a9b220349543ef3aab4a4985a881b9a3cc00528d9b09a2025d3600d437f74f1e03f02adcfb9418255e775d1e21388e901233b79
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc4.32.tar.bz2) = 40ef6eab3e7e2c89b90a4f8f89f136ec151a94f0f9fadfdba16ac6a72ea9507dc6f53e62f0b4fbb5bd312f6ff0a260d709d8b4d80b5c4934fb64b3742839c537
+SHA512 (kernel-kabi-dw-5.13.0-0.rc4.32.tar.bz2) = f70b810b9ad213dcf78412d009939325f525d9c354d02d1bdf481f5743be47eb6d448ecb0c06e67718a9a406be89054ecc8c911cc59ac84d1fbbeda8ce1bda34