kernel-5.16-0.rc6.20211224git7a29b11da965.45

* Fri Dec 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211224git7a29b11da965.45] - Fedora configs for 5.16 pt 1 (Justin M. Forbes) - redhat/configs: NFS: disable UDP, insecure enctypes (Benjamin Coddington) [1952863] Resolves: rhbz#1952863 Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2021-12-27 10:00:37 -06:00 · 2021-12-27 10:00:37 -06:00 · 985a297cc2
commit 985a297cc2
parent d8b7392fd8
27 changed files with 67 additions and 66 deletions
--- 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 = 44
+RHEL_RELEASE = 48

 #
 # Early y+1 numbering
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -4663,7 +4663,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -7277,7 +7277,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -3693,7 +3693,7 @@ CONFIG_NFS_COMMON=y
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 CONFIG_NFS_DEBUG=y
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5810,7 +5810,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -4639,7 +4639,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -7251,7 +7251,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -3672,7 +3672,7 @@ CONFIG_NFS_COMMON=y
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 CONFIG_NFS_DEBUG=y
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5786,7 +5786,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -4736,7 +4736,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -7472,7 +7472,7 @@ CONFIG_SUNDANCE=m
 # CONFIG_SUNGEM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 # CONFIG_SUNRPC_XPRT_RDMA is not set
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -4713,7 +4713,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -7447,7 +7447,7 @@ CONFIG_SUNDANCE=m
 # CONFIG_SUNGEM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 # CONFIG_SUNRPC_XPRT_RDMA is not set
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -4638,7 +4638,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -7240,7 +7240,7 @@ CONFIG_SUNDANCE=m
 # CONFIG_SUNGEM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 # CONFIG_SUNRPC_XPRT_RDMA is not set
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -4615,7 +4615,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -7215,7 +7215,7 @@ CONFIG_SUNDANCE=m
 # CONFIG_SUNGEM is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 # CONFIG_SUNRPC_XPRT_RDMA is not set
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@ -4244,7 +4244,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6524,7 +6524,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@ -4221,7 +4221,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6499,7 +6499,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -3998,7 +3998,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6219,7 +6219,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -3513,7 +3513,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5584,7 +5584,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -3974,7 +3974,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6193,7 +6193,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -3495,7 +3495,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5564,7 +5564,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -3976,7 +3976,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6162,7 +6162,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -3493,7 +3493,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5528,7 +5528,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -3952,7 +3952,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6136,7 +6136,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -3475,7 +3475,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5508,7 +5508,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -3491,7 +3491,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5533,7 +5533,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUN50I_IOMMU is not set
 # CONFIG_SUN_PARTITION is not set
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -4286,7 +4286,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6577,7 +6577,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -3685,7 +3685,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5762,7 +5762,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUNDANCE is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -4263,7 +4263,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_FLEXFILELAYOUT=y
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -6552,7 +6552,7 @@ CONFIG_SUNDANCE=m
 CONFIG_SUNGEM=m
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -3665,7 +3665,7 @@ CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NFSD_BLOCKLAYOUT is not set
 # CONFIG_NFSD_FLEXFILELAYOUT is not set
-# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
+CONFIG_NFS_DISABLE_UDP_SUPPORT=y
 CONFIG_NFSD=m
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_SCSILAYOUT=y
@ -5739,7 +5739,7 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_SUNDANCE is not set
 CONFIG_SUN_PARTITION=y
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y
 CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_XPRT_RDMA=m
--- a/kernel.spec
+++ b/kernel.spec
@ -85,9 +85,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.rc6.20211223gitbc491fb12513.44
+%global distro_build 0.rc7.48

 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@ -132,13 +132,13 @@ Summary: The Linux kernel

 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc6.20211223gitbc491fb12513.44
+%define pkgrelease 0.rc7.48

 # This is needed to do merge window version magic
 %define patchlevel 16

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20211223gitbc491fb12513.44%{?buildid}%{?dist}
+%define specrelease 0.rc7.48%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -689,7 +689,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc6-48-gbc491fb12513.tar.xz
+Source0: linux-5.16-rc7.tar.xz

 Source1: Makefile.rhelver

@ -1383,8 +1383,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.16-rc6-48-gbc491fb12513 -c
-mv linux-5.16-rc6-48-gbc491fb12513 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc7 -c
+mv linux-5.16-rc7 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -2981,8 +2981,9 @@ fi
 #
 #
 %changelog
-* Thu Dec 23 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.16-0.rc6.20211223gitbc491fb12513.44]
+* Fri Dec 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211224git7a29b11da965.45]
 - Fedora configs for 5.16 pt 1 (Justin M. Forbes)
+- redhat/configs: NFS: disable UDP, insecure enctypes (Benjamin Coddington) [1952863]

 * Tue Dec 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211221git59b3f9448833.42]
 - Update rebase-notes with dracut 5.17 information (Justin M. Forbes)
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@ -75,10 +75,10 @@
 74 files changed, 1512 insertions(+), 188 deletions(-)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index fc34332c8d9a..85f96e7a5005 100644
+index 2fba82431efb..3166f991adfa 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5940,6 +5940,15 @@
+@@ -5942,6 +5942,15 @@
 	unknown_nmi_panic
 			[X86] Cause panic on unknown NMI.

@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index d85f1ff79f5c..3eca2a2b70de 100644
+index 17b4319ad2ff..f6c96ef725a2 100644
 --- a/Makefile
 +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -270,7 +270,7 @@ index 0083464de5e3..2de5f417f3f2 100644
 		setup_force_cpu_cap(X86_FEATURE_CPUID);
 		cpu_parse_early_param();
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 6a190c7f4d71..f1e635696e01 100644
+index e04f5e6eb33f..0beeb4ebee6e 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
@@ -20,6 +20,7 @@
@ -289,7 +289,7 @@ index 6a190c7f4d71..f1e635696e01 100644

 /*
  * max_low_pfn_mapped: highest directly mapped pfn < 4 GB
-@@ -723,6 +725,51 @@ static void __init early_reserve_memory(void)
+@@ -720,6 +722,51 @@ static void __init early_reserve_memory(void)
 	trim_snb_memory();
 }

@ -341,7 +341,7 @@ index 6a190c7f4d71..f1e635696e01 100644
 /*
  * Dump out kernel offset information on panic.
  */
-@@ -941,6 +988,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -929,6 +976,13 @@ void __init setup_arch(char **cmdline_p)
 	if (efi_enabled(EFI_BOOT))
 		efi_init();

@ -355,7 +355,7 @@ index 6a190c7f4d71..f1e635696e01 100644
 	dmi_setup();

 	/*
-@@ -1106,19 +1160,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1094,19 +1148,7 @@ void __init setup_arch(char **cmdline_p)
 	/* Allocate bigger log buffer */
 	setup_log_buf(1);

@ -376,7 +376,7 @@ index 6a190c7f4d71..f1e635696e01 100644

 	reserve_initrd();

-@@ -1231,6 +1273,8 @@ void __init setup_arch(char **cmdline_p)
+@@ -1219,6 +1261,8 @@ void __init setup_arch(char **cmdline_p)
 		efi_apply_memmap_quirks();
 #endif

--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc6-48-gbc491fb12513.tar.xz) = 6fc71fa644c63284c34c581d1b76161d49ea999cb78bd479eed256e933346cdc3463e030fcf413870e9b834391242920774b8ed931d2d7c17342b8354104c9c5
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc6.20211223gitbc491fb12513.44.tar.bz2) = 2a2a4f9e3577ff3fbd7f0ac9932fcaf5e1b454ebe9df71d462715d281a4547a4c0c2ad1711846354351cbb88c3e0943045acdc3282e3c4486a32a775594ac215
-SHA512 (kernel-kabi-dw-5.16.0-0.rc6.20211223gitbc491fb12513.44.tar.bz2) = f777f5c77e625c80d2c84d6acc05b99ed0cec9b34ed2d003d0c7d1a8e8fa407d3977901a26633d94d51c12d750a07de4c5f0d6c113428b794612aeee2947a745
+SHA512 (linux-5.16-rc7.tar.xz) = d96360f417c9106f0198c726d48ecfa223742a7aead3b8986e99b4f77cd873d7b0a20a58023ba2d80f04ee6159f8bc9638bc49fea04a73bb6b0d0d88e13c335a
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc7.48.tar.bz2) = 75f47b3b85e7fc79820b6f358810793b0e00b1c0c87914013a0503821016f29213df16f57e88527db61601ce96c0d1f1620f7944cfeec4fca2117dfacba82a20
+SHA512 (kernel-kabi-dw-5.16.0-0.rc7.48.tar.bz2) = 241f6e0b575c7c61d35de1118b2740c2564c337995a5dbe9cd5a8da73f6451fb5ff02492507277c2539c426fa19ffcdcdcfc750d3f41b0d1c5f1db056106a705