Enable the AFS module (rhbz 1616016)

25 files changed, 139 insertions, 34 deletions

diff --git a/configs/fedora/generic/CONFIG_AFS_DEBUG b/configs/fedora/generic/CONFIG_AFS_DEBUG
new file mode 100644
index 000000000..1f0b35b94
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_AFS_DEBUG
@@ -0,0 +1 @@
+CONFIG_AFS_DEBUG=y
diff --git a/configs/fedora/generic/CONFIG_AFS_FS b/configs/fedora/generic/CONFIG_AFS_FS
index b622cdb8e..c6a8dc5f1 100644
--- a/configs/fedora/generic/CONFIG_AFS_FS
+++ b/configs/fedora/generic/CONFIG_AFS_FS
@@ -1 +1 @@
-# CONFIG_AFS_FS is not set
+CONFIG_AFS_FS=m
diff --git a/configs/fedora/generic/CONFIG_AFS_FSCACHE b/configs/fedora/generic/CONFIG_AFS_FSCACHE
new file mode 100644
index 000000000..9183d0b00
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_AFS_FSCACHE
@@ -0,0 +1 @@
+CONFIG_AFS_FSCACHE=y
diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC b/configs/fedora/generic/CONFIG_AF_RXRPC
index b703c0366..38801771c 100644
--- a/configs/fedora/generic/CONFIG_AF_RXRPC
+++ b/configs/fedora/generic/CONFIG_AF_RXRPC
@@ -1 +1 @@
-# CONFIG_AF_RXRPC is not set
+CONFIG_AF_RXRPC=m
diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG b/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG
new file mode 100644
index 000000000..bd42ab421
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG
@@ -0,0 +1 @@
+CONFIG_AF_RXRPC_DEBUG=y
diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS b/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS
new file mode 100644
index 000000000..5fd291dc1
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS
@@ -0,0 +1 @@
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
diff --git a/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6 b/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6
new file mode 100644
index 000000000..2400ed49c
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6
@@ -0,0 +1 @@
+CONFIG_AF_RXRPC_IPV6=y
diff --git a/configs/fedora/generic/CONFIG_RXKAD b/configs/fedora/generic/CONFIG_RXKAD
new file mode 100644
index 000000000..806e0eb65
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_RXKAD
@@ -0,0 +1 @@
+CONFIG_RXKAD=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 95c57887e..1fe71a731 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -152,8 +152,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
@@ -5059,6 +5064,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 # CONFIG_SAMSUNG_USBPHY is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 018592111..6fa6fe8e0 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -152,8 +152,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AHCI_CEVA=m
 CONFIG_AHCI_MVEBU=m
 # CONFIG_AHCI_QORIQ is not set
@@ -5036,6 +5041,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 # CONFIG_SAMSUNG_USBPHY is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index e1dbe26ba..09b607aad 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -126,8 +126,13 @@ CONFIG_AEABI=y
 # CONFIG_AFE4404 is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_DM816=m
 CONFIG_AHCI_IMX=m
@@ -5375,6 +5380,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 CONFIG_S3C2410_WATCHDOG=m
 # CONFIG_SAMPLES is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b65e225aa..3e9d515a8 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -126,8 +126,13 @@ CONFIG_AEABI=y
 # CONFIG_AFE4404 is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_DM816=m
 CONFIG_AHCI_MVEBU=m
@@ -5068,6 +5073,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 CONFIG_S3C2410_WATCHDOG=m
 # CONFIG_SAMPLES is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ad3251e5b..78538b8f1 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -126,8 +126,13 @@ CONFIG_AEABI=y
 # CONFIG_AFE4404 is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_DM816=m
 CONFIG_AHCI_MVEBU=m
@@ -5045,6 +5050,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 CONFIG_S3C2410_WATCHDOG=m
 # CONFIG_SAMPLES is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 10422f707..e412fde9c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -126,8 +126,13 @@ CONFIG_AEABI=y
 # CONFIG_AFE4404 is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AHCI_CEVA is not set
 CONFIG_AHCI_DM816=m
 CONFIG_AHCI_IMX=m
@@ -5352,6 +5357,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 CONFIG_S3C2410_WATCHDOG=m
 # CONFIG_SAMPLES is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index fa5df9793..f8cdff312 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AGP_ALI=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_AMD=y
@@ -4746,6 +4751,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_LAPTOP=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 4ee01eca5..caea5f79c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AGP_ALI=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_AMD=y
@@ -4770,6 +4775,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_LAPTOP=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index ee915442a..1771f0c47 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AGP_ALI=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_AMD=y
@@ -4770,6 +4775,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_LAPTOP=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 7a011e725..65c071fed 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -163,8 +163,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AGP_ALI=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_AMD=y
@@ -4746,6 +4751,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_LAPTOP=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 16b2d744f..bfb58aeb7 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -125,8 +125,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -4510,6 +4515,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 # CONFIG_SAMSUNG_USBPHY is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 78fab8d12..b3cf0a903 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -125,8 +125,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AGP is not set
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
@@ -4484,6 +4489,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 # CONFIG_SAMSUNG_USBPHY is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 0de5d16a5..a50f9e8a9 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -126,8 +126,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AFFS_FS=m
 CONFIG_AFIUCV=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AIC79XX_BUILD_FIRMWARE is not set
@@ -4398,6 +4403,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 CONFIG_S390_CCW_IOMMU=y
 CONFIG_S390_GUEST_OLD_TRANSPORT=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d73c9b2b1..ac7b431f2 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -126,8 +126,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_AFFS_FS=m
 CONFIG_AFIUCV=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 # CONFIG_AHCI_CEVA is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AIC79XX_BUILD_FIRMWARE is not set
@@ -4372,6 +4377,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 CONFIG_S390_CCW_IOMMU=y
 CONFIG_S390_GUEST_OLD_TRANSPORT=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 806433db2..5d00ce9a5 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -166,8 +166,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AGP_ALI=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_AMD=y
@@ -4812,6 +4817,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_LAPTOP=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 52696aea2..496e098fb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -166,8 +166,13 @@ CONFIG_ADAPTEC_STARFIRE=m
 # CONFIG_AFE4404 is not set
 CONFIG_AFFS_FS=m
 CONFIG_AF_KCM=m
-# CONFIG_AF_RXRPC is not set
-# CONFIG_AFS_FS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_IPV6=y
+CONFIG_AF_RXRPC=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_FS=m
 CONFIG_AGP_ALI=y
 CONFIG_AGP_AMD64=y
 CONFIG_AGP_AMD=y
@@ -4788,6 +4793,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLWIFI=m
 # CONFIG_RTS5208 is not set
 CONFIG_RUNTIME_TESTING_MENU=y
+CONFIG_RXKAD=y
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
 CONFIG_SAMSUNG_LAPTOP=m
diff --git a/kernel.spec b/kernel.spec
index b2a2dc8f5..f82575c96 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1863,6 +1863,9 @@ fi
 #
 #
 %changelog
+* Wed Aug 29 2018 Jeremy Cline <jeremy@jcline.org>
+- Enable the AFS module (rhbz 1616016)
+
 * Wed Aug 29 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc1.git2.1
 - Linux v4.19-rc1-95-g3f16503b7d22