Disable IPX and NCPFS

These are being deprecated by the kernel community
https://marc.info/?l=linux-netdev&m=151067745601327&w=2

Turn them off in advance.

21 files changed, 35 insertions, 32 deletions

diff --git a/configs/base-generic/CONFIG_IPX b/configs/base-generic/CONFIG_IPX
index 42770d9a6..1712b4f38 100644
--- a/configs/base-generic/CONFIG_IPX
+++ b/configs/base-generic/CONFIG_IPX
@@ -1 +1 @@
-CONFIG_IPX=m
+# CONFIG_IPX is not set
diff --git a/configs/base-generic/CONFIG_NCP_FS b/configs/base-generic/CONFIG_NCP_FS
index 520727796..62eb3bdd0 100644
--- a/configs/base-generic/CONFIG_NCP_FS
+++ b/configs/base-generic/CONFIG_NCP_FS
@@ -1 +1 @@
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 08f53582e..a2dd5e84c 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2442,7 +2442,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index f37dffb0b..8eb659e73 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2425,7 +2425,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ab737dc73..196f5da06 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2596,7 +2596,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 1dd769479..052e95f96 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2465,7 +2465,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b1c715e1a..0ecf558b5 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2448,7 +2448,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 6c5170ee6..d49810d90 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2579,7 +2579,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index fb19c1fbb..09ef3d8eb 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2337,7 +2337,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3200,7 +3200,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 105c69431..9344bae46 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2355,7 +2355,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3220,7 +3220,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 23322ed55..a3220bfef 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2355,7 +2355,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3220,7 +3220,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 63c6c89d5..78ab7ec32 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2337,7 +2337,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3200,7 +3200,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index a7b91fcf9..c4c55c402 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2206,7 +2206,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3044,7 +3044,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 4100d7805..b7b40c8d7 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2188,7 +2188,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3022,7 +3022,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 5d1e38826..f30de424e 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2151,7 +2151,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -2988,7 +2988,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 7627cfce4..59a0a4218 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2133,7 +2133,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -2966,7 +2966,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9d237fa49..82b082d0b 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2104,7 +2104,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -2925,7 +2925,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 220c86d49..ed31f652a 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2086,7 +2086,7 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -2903,7 +2903,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 0908e18b3..be68b2ef4 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2410,7 +2410,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3261,7 +3261,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 41552ecb3..171c43caf 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2392,7 +2392,7 @@ CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
 CONFIG_IPWIRELESS=m
 # CONFIG_IPX_INTERN is not set
-CONFIG_IPX=m
+# CONFIG_IPX is not set
 CONFIG_IRCOMM=m
 CONFIG_IRDA_CACHE_LAST_LSAP=y
 # CONFIG_IRDA_DEBUG is not set
@@ -3241,7 +3241,7 @@ CONFIG_NATSEMI=m
 # CONFIG_NBPFAXI_DMA is not set
 CONFIG_NCPFS_EXTRAS=y
 CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCP_FS=m
+# CONFIG_NCP_FS is not set
 CONFIG_NCPFS_NFS_NS=y
 CONFIG_NCPFS_NLS=y
 CONFIG_NCPFS_OS2_NS=y
diff --git a/kernel.spec b/kernel.spec
index c7520f324..bdf1af2f7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2203,6 +2203,9 @@ fi
 #
 #
 %changelog
+* Wed Nov 15 2017 Laura Abbott <labbott@redhat.com>
+- Disable IPX and NCPFS
+
 * Wed Nov 15 2017 Laura Abbott <labbott@redhat.com> - 4.15.0-0.rc0.git3.1
 - Linux v4.14-4050-g37cb8e1f8e10