Skip to contentSkip to conversation

net: enable IPv6 iff IPv4

PATCH In review Maciej Żenczykowski 3 participants 8 messages Apr 1, 2019

Subsystems (28)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 net: enable IPv6 iff IPv4

From: Maciej Żenczykowski <[email protected]>

IPv6 is 20 years old and IPv4 has run out of IP addresses and is deprecated.

It is time to make IPv6 a first class citizen.

As such we remove the ability to compile IPv6 as a module, and IPv4 support now implies IPv6 support.

This has the nice benefit of allowing upcoming code simplification:
all IPv6 module support can be removed, and we'll be able to merge IPv6 socket state into the base IPv4 socket state...

At some point we should be able to reverse things and make IPv4 the optional protocol and possibly even make an ipv4.ko.

---
 net/Kconfig      | 1 +
 net/ipv6/Kconfig | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)
net/Kconfig +1 -0
index 3e8fdd688329..0f2ca2137f9e 100644
@@ -68,6 +68,7 @@ config INET
 	bool "TCP/IP networking"
 	select CRYPTO
 	select CRYPTO_AES
+	select IPV6
 	---help---
 	  These are the protocols used on the Internet and on most local
 	  Ethernets. It is highly recommended to say Y here (this will enlarge
net/ipv6/Kconfig +1 -6
index 613282c65a10..9197f496a112 100644
@@ -2,10 +2,8 @@
 # IPv6 configuration
 #
 
-#   IPv6 as module will cause a CRASH if you try to unload it
 menuconfig IPV6
-	tristate "The IPv6 protocol"
-	default y
+	bool "The IPv6 protocol"
 	---help---
 	  Support for IP version 6 (IPv6).
 
@@ -15,9 +13,6 @@ menuconfig IPV6
 	  Documentation/networking/ipv6.txt and read the HOWTO at
 	  <http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/>
 
-	  To compile this protocol support as a module, choose M here: the
-	  module will be called ipv6.
-
 if IPV6
 
 config IPV6_ROUTER_PREF
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#1 lore raw

PATCH 2/2 net: configs - remove CONFIG_IPV6 references

From: Maciej Żenczykowski <[email protected]>

---
 arch/alpha/defconfig                              | 1 -
 arch/arc/configs/axs101_defconfig                 | 1 -
 arch/arc/configs/axs103_defconfig                 | 1 -
 arch/arc/configs/axs103_smp_defconfig             | 1 -
 arch/arc/configs/haps_hs_defconfig                | 1 -
 arch/arc/configs/haps_hs_smp_defconfig            | 1 -
 arch/arc/configs/nps_defconfig                    | 1 -
 arch/arc/configs/nsim_700_defconfig               | 1 -
 arch/arc/configs/nsim_hs_defconfig                | 1 -
 arch/arc/configs/nsim_hs_smp_defconfig            | 1 -
 arch/arc/configs/nsimosci_defconfig               | 1 -
 arch/arc/configs/nsimosci_hs_defconfig            | 1 -
 arch/arc/configs/nsimosci_hs_smp_defconfig        | 1 -
 arch/arc/configs/tb10x_defconfig                  | 1 -
 arch/arc/configs/vdk_hs38_defconfig               | 1 -
 arch/arc/configs/vdk_hs38_smp_defconfig           | 1 -
 arch/arm/configs/acs5k_defconfig                  | 1 -
 arch/arm/configs/acs5k_tiny_defconfig             | 1 -
 arch/arm/configs/am200epdkit_defconfig            | 1 -
 arch/arm/configs/assabet_defconfig                | 1 -
 arch/arm/configs/axm55xx_defconfig                | 1 -
 arch/arm/configs/badge4_defconfig                 | 1 -
 arch/arm/configs/cerfcube_defconfig               | 1 -
 arch/arm/configs/clps711x_defconfig               | 1 -
 arch/arm/configs/cm_x2xx_defconfig                | 1 -
 arch/arm/configs/cm_x300_defconfig                | 1 -
 arch/arm/configs/colibri_pxa270_defconfig         | 1 -
 arch/arm/configs/colibri_pxa300_defconfig         | 1 -
 arch/arm/configs/collie_defconfig                 | 1 -
 arch/arm/configs/dove_defconfig                   | 1 -
 arch/arm/configs/ebsa110_defconfig                | 1 -
 arch/arm/configs/efm32_defconfig                  | 1 -
 arch/arm/configs/em_x270_defconfig                | 1 -
 arch/arm/configs/ep93xx_defconfig                 | 1 -
 arch/arm/configs/eseries_pxa_defconfig            | 1 -
 arch/arm/configs/footbridge_defconfig             | 1 -
 arch/arm/configs/h3600_defconfig                  | 1 -
 arch/arm/configs/h5000_defconfig                  | 1 -
 arch/arm/configs/hackkit_defconfig                | 1 -
 arch/arm/configs/imx_v4_v5_defconfig              | 1 -
 arch/arm/configs/integrator_defconfig             | 1 -
 arch/arm/configs/iop13xx_defconfig                | 1 -
 arch/arm/configs/iop32x_defconfig                 | 1 -
 arch/arm/configs/iop33x_defconfig                 | 1 -
 arch/arm/configs/ixp4xx_defconfig                 | 1 -
 arch/arm/configs/jornada720_defconfig             | 1 -
 arch/arm/configs/ks8695_defconfig                 | 1 -
 arch/arm/configs/lart_defconfig                   | 1 -
 arch/arm/configs/lpc18xx_defconfig                | 1 -
 arch/arm/configs/lpd270_defconfig                 | 1 -
 arch/arm/configs/lubbock_defconfig                | 1 -
 arch/arm/configs/magician_defconfig               | 1 -
 arch/arm/configs/mainstone_defconfig              | 1 -
 arch/arm/configs/mini2440_defconfig               | 1 -
 arch/arm/configs/mmp2_defconfig                   | 1 -
 arch/arm/configs/moxart_defconfig                 | 1 -
 arch/arm/configs/mps2_defconfig                   | 1 -
 arch/arm/configs/mv78xx0_defconfig                | 1 -
 arch/arm/configs/mvebu_v5_defconfig               | 1 -
 arch/arm/configs/mxs_defconfig                    | 1 -
 arch/arm/configs/neponset_defconfig               | 1 -
 arch/arm/configs/netwinder_defconfig              | 1 -
 arch/arm/configs/nhk8815_defconfig                | 1 -
 arch/arm/configs/omap1_defconfig                  | 1 -
 arch/arm/configs/orion5x_defconfig                | 1 -
 arch/arm/configs/palmz72_defconfig                | 1 -
 arch/arm/configs/pcm027_defconfig                 | 1 -
 arch/arm/configs/pleb_defconfig                   | 1 -
 arch/arm/configs/pxa168_defconfig                 | 1 -
 arch/arm/configs/pxa255-idp_defconfig             | 1 -
 arch/arm/configs/pxa3xx_defconfig                 | 1 -
 arch/arm/configs/pxa910_defconfig                 | 1 -
 arch/arm/configs/pxa_defconfig                    | 1 -
 arch/arm/configs/qcom_defconfig                   | 1 -
 arch/arm/configs/realview_defconfig               | 1 -
 arch/arm/configs/shannon_defconfig                | 1 -
 arch/arm/configs/simpad_defconfig                 | 1 -
 arch/arm/configs/sunxi_defconfig                  | 1 -
 arch/arm/configs/tango4_defconfig                 | 1 -
 arch/arm/configs/trizeps4_defconfig               | 1 -
 arch/arm/configs/versatile_defconfig              | 1 -
 arch/arm/configs/vexpress_defconfig               | 1 -
 arch/arm/configs/viper_defconfig                  | 1 -
 arch/arm/configs/xcep_defconfig                   | 1 -
 arch/arm/configs/zeus_defconfig                   | 1 -
 arch/arm64/configs/defconfig                      | 1 -
 arch/hexagon/configs/comet_defconfig              | 1 -
 arch/ia64/configs/bigsur_defconfig                | 1 -
 arch/ia64/configs/generic_defconfig               | 1 -
 arch/ia64/configs/gensparse_defconfig             | 1 -
 arch/ia64/configs/sim_defconfig                   | 1 -
 arch/ia64/configs/tiger_defconfig                 | 1 -
 arch/ia64/configs/zx1_defconfig                   | 1 -
 arch/m68k/configs/amcore_defconfig                | 1 -
 arch/m68k/configs/amiga_defconfig                 | 1 -
 arch/m68k/configs/apollo_defconfig                | 1 -
 arch/m68k/configs/atari_defconfig                 | 1 -
 arch/m68k/configs/bvme6000_defconfig              | 1 -
 arch/m68k/configs/hp300_defconfig                 | 1 -
 arch/m68k/configs/m5208evb_defconfig              | 1 -
 arch/m68k/configs/m5249evb_defconfig              | 1 -
 arch/m68k/configs/m5272c3_defconfig               | 1 -
 arch/m68k/configs/m5275evb_defconfig              | 1 -
 arch/m68k/configs/m5307c3_defconfig               | 1 -
 arch/m68k/configs/m5407c3_defconfig               | 1 -
 arch/m68k/configs/mac_defconfig                   | 1 -
 arch/m68k/configs/multi_defconfig                 | 1 -
 arch/m68k/configs/mvme147_defconfig               | 1 -
 arch/m68k/configs/mvme16x_defconfig               | 1 -
 arch/m68k/configs/q40_defconfig                   | 1 -
 arch/m68k/configs/sun3_defconfig                  | 1 -
 arch/m68k/configs/sun3x_defconfig                 | 1 -
 arch/microblaze/configs/mmu_defconfig             | 1 -
 arch/microblaze/configs/nommu_defconfig           | 1 -
 arch/mips/configs/ar7_defconfig                   | 1 -
 arch/mips/configs/ath25_defconfig                 | 1 -
 arch/mips/configs/ath79_defconfig                 | 1 -
 arch/mips/configs/bcm63xx_defconfig               | 1 -
 arch/mips/configs/capcella_defconfig              | 1 -
 arch/mips/configs/ci20_defconfig                  | 1 -
 arch/mips/configs/cobalt_defconfig                | 1 -
 arch/mips/configs/fuloong2e_defconfig             | 1 -
 arch/mips/configs/gpr_defconfig                   | 1 -
 arch/mips/configs/ip28_defconfig                  | 1 -
 arch/mips/configs/jmr3927_defconfig               | 1 -
 arch/mips/configs/lasat_defconfig                 | 1 -
 arch/mips/configs/loongson1b_defconfig            | 1 -
 arch/mips/configs/loongson1c_defconfig            | 1 -
 arch/mips/configs/mpc30x_defconfig                | 1 -
 arch/mips/configs/msp71xx_defconfig               | 1 -
 arch/mips/configs/omega2p_defconfig               | 1 -
 arch/mips/configs/pnx8335_stb225_defconfig        | 1 -
 arch/mips/configs/qi_lb60_defconfig               | 1 -
 arch/mips/configs/rb532_defconfig                 | 1 -
 arch/mips/configs/rbtx49xx_defconfig              | 1 -
 arch/mips/configs/rt305x_defconfig                | 1 -
 arch/mips/configs/sb1250_swarm_defconfig          | 1 -
 arch/mips/configs/tb0219_defconfig                | 1 -
 arch/mips/configs/tb0226_defconfig                | 1 -
 arch/mips/configs/tb0287_defconfig                | 1 -
 arch/mips/configs/vocore2_defconfig               | 1 -
 arch/mips/configs/workpad_defconfig               | 1 -
 arch/mips/configs/xway_defconfig                  | 1 -
 arch/nds32/configs/defconfig                      | 1 -
 arch/nios2/configs/10m50_defconfig                | 1 -
 arch/nios2/configs/3c120_defconfig                | 1 -
 arch/openrisc/configs/or1ksim_defconfig           | 1 -
 arch/openrisc/configs/simple_smp_defconfig        | 1 -
 arch/parisc/configs/712_defconfig                 | 1 -
 arch/parisc/configs/c8000_defconfig               | 1 -
 arch/powerpc/configs/40x/acadia_defconfig         | 1 -
 arch/powerpc/configs/40x/ep405_defconfig          | 1 -
 arch/powerpc/configs/40x/kilauea_defconfig        | 1 -
 arch/powerpc/configs/40x/makalu_defconfig         | 1 -
 arch/powerpc/configs/40x/obs600_defconfig         | 1 -
 arch/powerpc/configs/40x/walnut_defconfig         | 1 -
 arch/powerpc/configs/44x/akebono_defconfig        | 1 -
 arch/powerpc/configs/44x/arches_defconfig         | 1 -
 arch/powerpc/configs/44x/bamboo_defconfig         | 1 -
 arch/powerpc/configs/44x/canyonlands_defconfig    | 1 -
 arch/powerpc/configs/44x/currituck_defconfig      | 1 -
 arch/powerpc/configs/44x/ebony_defconfig          | 1 -
 arch/powerpc/configs/44x/eiger_defconfig          | 1 -
 arch/powerpc/configs/44x/fsp2_defconfig           | 1 -
 arch/powerpc/configs/44x/icon_defconfig           | 1 -
 arch/powerpc/configs/44x/iss476-smp_defconfig     | 1 -
 arch/powerpc/configs/44x/katmai_defconfig         | 1 -
 arch/powerpc/configs/44x/rainier_defconfig        | 1 -
 arch/powerpc/configs/44x/redwood_defconfig        | 1 -
 arch/powerpc/configs/44x/sam440ep_defconfig       | 1 -
 arch/powerpc/configs/44x/sequoia_defconfig        | 1 -
 arch/powerpc/configs/44x/taishan_defconfig        | 1 -
 arch/powerpc/configs/44x/warp_defconfig           | 1 -
 arch/powerpc/configs/52xx/cm5200_defconfig        | 1 -
 arch/powerpc/configs/52xx/lite5200b_defconfig     | 1 -
 arch/powerpc/configs/52xx/motionpro_defconfig     | 1 -
 arch/powerpc/configs/52xx/pcm030_defconfig        | 1 -
 arch/powerpc/configs/52xx/tqm5200_defconfig       | 1 -
 arch/powerpc/configs/83xx/asp8347_defconfig       | 1 -
 arch/powerpc/configs/83xx/kmeter1_defconfig       | 1 -
 arch/powerpc/configs/83xx/mpc8313_rdb_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc8315_rdb_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc832x_mds_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc832x_rdb_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc834x_itx_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | 1 -
 arch/powerpc/configs/83xx/mpc834x_mds_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc836x_mds_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc836x_rdk_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc837x_mds_defconfig   | 1 -
 arch/powerpc/configs/83xx/mpc837x_rdb_defconfig   | 1 -
 arch/powerpc/configs/85xx/ksi8560_defconfig       | 1 -
 arch/powerpc/configs/85xx/mpc8540_ads_defconfig   | 1 -
 arch/powerpc/configs/85xx/mpc8560_ads_defconfig   | 1 -
 arch/powerpc/configs/85xx/mpc85xx_cds_defconfig   | 1 -
 arch/powerpc/configs/85xx/sbc8548_defconfig       | 1 -
 arch/powerpc/configs/85xx/socrates_defconfig      | 1 -
 arch/powerpc/configs/85xx/stx_gp3_defconfig       | 1 -
 arch/powerpc/configs/85xx/tqm8540_defconfig       | 1 -
 arch/powerpc/configs/85xx/tqm8541_defconfig       | 1 -
 arch/powerpc/configs/85xx/tqm8548_defconfig       | 1 -
 arch/powerpc/configs/85xx/tqm8555_defconfig       | 1 -
 arch/powerpc/configs/85xx/tqm8560_defconfig       | 1 -
 arch/powerpc/configs/adder875_defconfig           | 1 -
 arch/powerpc/configs/amigaone_defconfig           | 1 -
 arch/powerpc/configs/chrp32_defconfig             | 1 -
 arch/powerpc/configs/ep88xc_defconfig             | 1 -
 arch/powerpc/configs/fsl-emb-nonhw.config         | 1 -
 arch/powerpc/configs/g5_defconfig                 | 1 -
 arch/powerpc/configs/gamecube_defconfig           | 1 -
 arch/powerpc/configs/holly_defconfig              | 1 -
 arch/powerpc/configs/linkstation_defconfig        | 1 -
 arch/powerpc/configs/maple_defconfig              | 1 -
 arch/powerpc/configs/mgcoge_defconfig             | 1 -
 arch/powerpc/configs/mpc512x_defconfig            | 1 -
 arch/powerpc/configs/mpc5200_defconfig            | 1 -
 arch/powerpc/configs/mpc7448_hpc2_defconfig       | 1 -
 arch/powerpc/configs/mpc83xx_defconfig            | 1 -
 arch/powerpc/configs/mpc866_ads_defconfig         | 1 -
 arch/powerpc/configs/mpc885_ads_defconfig         | 1 -
 arch/powerpc/configs/mvme5100_defconfig           | 1 -
 arch/powerpc/configs/pasemi_defconfig             | 1 -
 arch/powerpc/configs/pmac32_defconfig             | 1 -
 arch/powerpc/configs/ppc64_defconfig              | 1 -
 arch/powerpc/configs/ppc64e_defconfig             | 1 -
 arch/powerpc/configs/pseries_defconfig            | 1 -
 arch/powerpc/configs/storcenter_defconfig         | 1 -
 arch/powerpc/configs/tqm8xx_defconfig             | 1 -
 arch/powerpc/configs/wii_defconfig                | 1 -
 arch/sh/configs/ap325rxa_defconfig                | 1 -
 arch/sh/configs/apsh4a3a_defconfig                | 1 -
 arch/sh/configs/apsh4ad0a_defconfig               | 1 -
 arch/sh/configs/cayman_defconfig                  | 1 -
 arch/sh/configs/dreamcast_defconfig               | 1 -
 arch/sh/configs/ecovec24-romimage_defconfig       | 1 -
 arch/sh/configs/ecovec24_defconfig                | 1 -
 arch/sh/configs/edosk7760_defconfig               | 1 -
 arch/sh/configs/espt_defconfig                    | 1 -
 arch/sh/configs/kfr2r09-romimage_defconfig        | 1 -
 arch/sh/configs/kfr2r09_defconfig                 | 1 -
 arch/sh/configs/landisk_defconfig                 | 1 -
 arch/sh/configs/lboxre2_defconfig                 | 1 -
 arch/sh/configs/magicpanelr2_defconfig            | 1 -
 arch/sh/configs/microdev_defconfig                | 1 -
 arch/sh/configs/migor_defconfig                   | 1 -
 arch/sh/configs/polaris_defconfig                 | 1 -
 arch/sh/configs/r7780mp_defconfig                 | 1 -
 arch/sh/configs/r7785rp_defconfig                 | 1 -
 arch/sh/configs/rsk7203_defconfig                 | 1 -
 arch/sh/configs/rsk7264_defconfig                 | 1 -
 arch/sh/configs/rsk7269_defconfig                 | 1 -
 arch/sh/configs/rts7751r2d1_defconfig             | 1 -
 arch/sh/configs/rts7751r2dplus_defconfig          | 1 -
 arch/sh/configs/sdk7780_defconfig                 | 1 -
 arch/sh/configs/sdk7786_defconfig                 | 1 -
 arch/sh/configs/se7206_defconfig                  | 1 -
 arch/sh/configs/se7343_defconfig                  | 1 -
 arch/sh/configs/se7705_defconfig                  | 1 -
 arch/sh/configs/se7712_defconfig                  | 1 -
 arch/sh/configs/se7721_defconfig                  | 1 -
 arch/sh/configs/se7722_defconfig                  | 1 -
 arch/sh/configs/se7724_defconfig                  | 1 -
 arch/sh/configs/se7750_defconfig                  | 1 -
 arch/sh/configs/se7751_defconfig                  | 1 -
 arch/sh/configs/se7780_defconfig                  | 1 -
 arch/sh/configs/secureedge5410_defconfig          | 1 -
 arch/sh/configs/sh03_defconfig                    | 1 -
 arch/sh/configs/sh2007_defconfig                  | 1 -
 arch/sh/configs/sh7710voipgw_defconfig            | 1 -
 arch/sh/configs/sh7757lcr_defconfig               | 1 -
 arch/sh/configs/sh7763rdp_defconfig               | 1 -
 arch/sh/configs/sh7785lcr_32bit_defconfig         | 1 -
 arch/sh/configs/sh7785lcr_defconfig               | 1 -
 arch/sh/configs/shmin_defconfig                   | 1 -
 arch/sh/configs/titan_defconfig                   | 1 -
 arch/sh/configs/ul2_defconfig                     | 1 -
 arch/sh/configs/urquell_defconfig                 | 1 -
 arch/um/configs/i386_defconfig                    | 1 -
 arch/um/configs/x86_64_defconfig                  | 1 -
 arch/unicore32/configs/unicore32_defconfig        | 1 -
 arch/x86/configs/i386_defconfig                   | 1 -
 arch/x86/configs/x86_64_defconfig                 | 1 -
 arch/xtensa/configs/audio_kc705_defconfig         | 1 -
 arch/xtensa/configs/cadence_csp_defconfig         | 1 -
 arch/xtensa/configs/common_defconfig              | 1 -
 arch/xtensa/configs/generic_kc705_defconfig       | 1 -
 arch/xtensa/configs/iss_defconfig                 | 1 -
 arch/xtensa/configs/nommu_kc705_defconfig         | 1 -
 arch/xtensa/configs/smp_lx200_defconfig           | 1 -
 kernel/configs/android-base.config                | 1 -
 tools/testing/selftests/bpf/config                | 1 -
 tools/testing/selftests/net/config                | 1 -
 292 files changed, 292 deletions(-)
arch/alpha/defconfig +0 -1
index f4ec420d7f2d..fe6eac493981 100644
@@ -17,7 +17,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_FILTER=m
arch/arc/configs/axs101_defconfig +0 -1
index e31a8ebc3ecc..7785fe199d12 100644
@@ -38,7 +38,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/axs103_defconfig +0 -1
index e0e8567f0d75..7ffab9109865 100644
@@ -37,7 +37,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/axs103_smp_defconfig +0 -1
index fcbc952bc75b..759944c5999c 100644
@@ -38,7 +38,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/haps_hs_defconfig +0 -1
index f56cc2070c11..bcd23db90343 100644
@@ -33,7 +33,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
arch/arc/configs/haps_hs_smp_defconfig +0 -1
index b6f2482c7e74..c644f9cc5c94 100644
@@ -36,7 +36,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
arch/arc/configs/nps_defconfig +0 -1
index f0a077c00efa..ad31198c2b4b 100644
@@ -40,7 +40,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/arc/configs/nsim_700_defconfig +0 -1
index 318e4cd29629..a6b95895729c 100644
@@ -31,7 +31,6 @@ CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/nsim_hs_defconfig +0 -1
index c15807b0e0c1..160024c54e42 100644
@@ -34,7 +34,6 @@ CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/nsim_hs_smp_defconfig +0 -1
index 65e983fd942b..2ba0ab1b3379 100644
@@ -33,7 +33,6 @@ CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/nsimosci_defconfig +0 -1
index 08c5b99ac341..342c8adb09c1 100644
@@ -30,7 +30,6 @@ CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/nsimosci_hs_defconfig +0 -1
index 5b5e26d67955..f347c6b36942 100644
@@ -30,7 +30,6 @@ CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arc/configs/nsimosci_hs_smp_defconfig +0 -1
index 26af9b2f7fcb..7a3e70323f1b 100644
@@ -32,7 +32,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 # CONFIG_STANDALONE is not set
arch/arc/configs/tb10x_defconfig +0 -1
index 5b5119d2b5d5..10a2145f8569 100644
@@ -40,7 +40,6 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_NETDEVICES=y
arch/arc/configs/vdk_hs38_defconfig +0 -1
index 0c3b21416819..68b7465e3e37 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
arch/arc/configs/vdk_hs38_smp_defconfig +0 -1
index f9ad9d3ee702..532eb255fc5e 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
arch/arm/configs/acs5k_defconfig +0 -1
index d04ee19e5b75..517df025da27 100644
@@ -29,7 +29,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/arm/configs/acs5k_tiny_defconfig +0 -1
index 25c593df41d1..e85aa6199c0b 100644
@@ -24,7 +24,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/arm/configs/am200epdkit_defconfig +0 -1
index 8c9b6ea46188..6e1bd8831649 100644
@@ -30,7 +30,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
arch/arm/configs/assabet_defconfig +0 -1
index 04c86ff558da..43b7b0d5b3f9 100644
@@ -16,7 +16,6 @@ CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
 CONFIG_SA1100_FIR=m
arch/arm/configs/axm55xx_defconfig +0 -1
index 53864316bee1..120c8e3e5bb0 100644
@@ -74,7 +74,6 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_BRIDGE=y
 # CONFIG_WIRELESS is not set
arch/arm/configs/badge4_defconfig +0 -1
index 5ae5b5228467..2be2a043e08b 100644
@@ -15,7 +15,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=y
 CONFIG_IRLAN=y
 CONFIG_IRCOMM=y
arch/arm/configs/cerfcube_defconfig +0 -1
index 3f910bbf1bfd..44d9d3b9c02f 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/arm/configs/clps711x_defconfig +0 -1
index fc105c9178cc..ec8e7218fc92 100644
@@ -23,7 +23,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=y
 CONFIG_IRTTY_SIR=y
 # CONFIG_WIRELESS is not set
arch/arm/configs/cm_x2xx_defconfig +0 -1
index fb45b4983d3c..5bd6768a9752 100644
@@ -39,7 +39,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_BNEP=m
arch/arm/configs/cm_x300_defconfig +0 -1
index 5e349c625b71..1015e9fde981 100644
@@ -35,7 +35,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
arch/arm/configs/colibri_pxa270_defconfig +0 -1
index 8995695fc118..e23c826076df 100644
@@ -31,7 +31,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_VLAN_8021Q=m
 CONFIG_IRDA=m
arch/arm/configs/colibri_pxa300_defconfig +0 -1
index d282e8b0bf33..b7893b385d9a 100644
@@ -13,7 +13,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_SYN_COOKIES=y
-CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
arch/arm/configs/collie_defconfig +0 -1
index d398ae53aba7..a4b781d87436 100644
@@ -23,7 +23,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
arch/arm/configs/dove_defconfig +0 -1
index 2f01e84b3d8c..70dea3b54c19 100644
@@ -30,7 +30,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/arm/configs/ebsa110_defconfig +0 -1
index 731a22a55f4e..aabccbc5ec82 100644
@@ -24,7 +24,6 @@ CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-CONFIG_IPV6=y
 CONFIG_NETFILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_ECN=y
arch/arm/configs/efm32_defconfig +0 -1
index ee42158f41ec..ff343ff47cf7 100644
@@ -39,7 +39,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/arm/configs/em_x270_defconfig +0 -1
index 30a67523f860..2371a5267ce9 100644
@@ -34,7 +34,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_BNEP=m
arch/arm/configs/ep93xx_defconfig +0 -1
index 78cd73d1c795..df984c3a03d9 100644
@@ -45,7 +45,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
arch/arm/configs/eseries_pxa_defconfig +0 -1
index eabb784cf7da..21f79f2547db 100644
@@ -28,7 +28,6 @@ CONFIG_PM=y
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=y
 CONFIG_IRLAN=m
 CONFIG_IRCOMM=m
arch/arm/configs/footbridge_defconfig +0 -1
index 3a7938f244e5..0b40afaca415 100644
@@ -25,7 +25,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_ATM=y
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
arch/arm/configs/h3600_defconfig +0 -1
index ebeca11faa48..360129085f09 100644
@@ -20,7 +20,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
arch/arm/configs/h5000_defconfig +0 -1
index e90d1dfeb188..d0cbfc711233 100644
@@ -31,7 +31,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/arm/configs/hackkit_defconfig +0 -1
index 742d18cdabde..903e37eed8f3 100644
@@ -17,7 +17,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_DEBUG=y
 CONFIG_MTD_DEBUG_VERBOSE=3
arch/arm/configs/imx_v4_v5_defconfig +0 -1
index 8661dd9b064a..8382e300c134 100644
@@ -45,7 +45,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/arm/configs/integrator_defconfig +0 -1
index 747550c7af2f..61ead7382a68 100644
@@ -36,7 +36,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_AFS_PARTS=y
arch/arm/configs/iop13xx_defconfig +0 -1
index a73b6a31a4ab..302db0b04f3f 100644
@@ -29,7 +29,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
arch/arm/configs/iop32x_defconfig +0 -1
index f63362b665eb..67880d0a63e7 100644
@@ -25,7 +25,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
arch/arm/configs/iop33x_defconfig +0 -1
index d22f832ccfd6..7ba96c037aa0 100644
@@ -23,7 +23,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
arch/arm/configs/ixp4xx_defconfig +0 -1
index 8c3c99cd6de9..587359308239 100644
@@ -49,7 +49,6 @@ CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_IP_VS=m
 CONFIG_IP_VS_DEBUG=y
arch/arm/configs/jornada720_defconfig +0 -1
index 65d37ad6e6b8..a832ae090418 100644
@@ -18,7 +18,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
arch/arm/configs/ks8695_defconfig +0 -1
index b8b91d790e9b..cb12e7e729ec 100644
@@ -27,7 +27,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
arch/arm/configs/lart_defconfig +0 -1
index b6ddb9884326..78ec6c55e31c 100644
@@ -19,7 +19,6 @@ CONFIG_PACKET=m
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
arch/arm/configs/lpc18xx_defconfig +0 -1
index e3d5e15d66d1..235d24c9f24f 100644
@@ -44,7 +44,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/arm/configs/lpd270_defconfig +0 -1
index 3a4d0e64cd6e..cf3eda1cd9b3 100644
@@ -14,7 +14,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
arch/arm/configs/lubbock_defconfig +0 -1
index 4ce2da2e76fa..4e0a62a78054 100644
@@ -17,7 +17,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/arm/configs/magician_defconfig +0 -1
index de5be2fc7306..ca6ce8ca3068 100644
@@ -35,7 +35,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
 CONFIG_IRCOMM=m
arch/arm/configs/mainstone_defconfig +0 -1
index 26499b697f9f..65a4e8005e6f 100644
@@ -15,7 +15,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/arm/configs/mini2440_defconfig +0 -1
index d95a8059d30b..6c7a703eb2c7 100644
@@ -50,7 +50,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
arch/arm/configs/mmp2_defconfig +0 -1
index 1eeee7f11d91..48f978720846 100644
@@ -22,7 +22,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_MTD=y
arch/arm/configs/moxart_defconfig +0 -1
index 078228a19339..cfb4ee278fa5 100644
@@ -37,7 +37,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/arm/configs/mps2_defconfig +0 -1
index 1d923dbb9928..6d0bed2b9729 100644
@@ -36,7 +36,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/arm/configs/mv78xx0_defconfig +0 -1
index 0448bd8075ac..0562a65f2c3f 100644
@@ -34,7 +34,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
arch/arm/configs/mvebu_v5_defconfig +0 -1
index 4b598da0d086..c871eda9f562 100644
@@ -56,7 +56,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NET_DSA=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_PKTGEN=m
arch/arm/configs/mxs_defconfig +0 -1
index 38480596c449..b012c0718c43 100644
@@ -38,7 +38,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_CAN=m
 CONFIG_CAN_FLEXCAN=m
 # CONFIG_WIRELESS is not set
arch/arm/configs/neponset_defconfig +0 -1
index 018a1092d0e7..f4032f4353f9 100644
@@ -22,7 +22,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/arm/configs/netwinder_defconfig +0 -1
index 2e3b20ef0db1..b4301d6267ee 100644
@@ -18,7 +18,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_PARPORT=y
arch/arm/configs/nhk8815_defconfig +0 -1
index 5f4c6aaa07f6..ff8c1c562670 100644
@@ -33,7 +33,6 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_NET_IPIP=y
 CONFIG_IP_MROUTE=y
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
arch/arm/configs/omap1_defconfig +0 -1
index cfc00b0961ec..6973e150f780 100644
@@ -73,7 +73,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
 CONFIG_NETFILTER=y
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
arch/arm/configs/orion5x_defconfig +0 -1
index bf9046331f6e..c09e9d5cba2a 100644
@@ -56,7 +56,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NET_DSA=y
 CONFIG_NET_PKTGEN=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/arm/configs/palmz72_defconfig +0 -1
index e0a614272561..7382010ddd61 100644
@@ -29,7 +29,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
arch/arm/configs/pcm027_defconfig +0 -1
index 9c88a193490c..4f05f125e14b 100644
@@ -34,7 +34,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/arm/configs/pleb_defconfig +0 -1
index f0541b060cfa..01350f1120e4 100644
@@ -21,7 +21,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
arch/arm/configs/pxa168_defconfig +0 -1
index e7c7b91b6de2..47795a2b6439 100644
@@ -23,7 +23,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arm/configs/pxa255-idp_defconfig +0 -1
index 4a383afa5e87..1b9c58f06760 100644
@@ -15,7 +15,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
arch/arm/configs/pxa3xx_defconfig +0 -1
index 3e0de035ab77..15488d342681 100644
@@ -25,7 +25,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arm/configs/pxa910_defconfig +0 -1
index 3aff71e6dae5..a0faf06a1510 100644
@@ -23,7 +23,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/arm/configs/pxa_defconfig +0 -1
index d4654755b09c..5f13ff19f0ba 100644
@@ -115,7 +115,6 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=m
 CONFIG_IEEE802154=y
arch/arm/configs/qcom_defconfig +0 -1
index bd6440f23493..aed21ebbdbbd 100644
@@ -49,7 +49,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_CFG80211=y
 CONFIG_RFKILL=y
 CONFIG_DEVTMPFS=y
arch/arm/configs/realview_defconfig +0 -1
index cc9fa24d4b8f..052867af0753 100644
@@ -33,7 +33,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/arm/configs/shannon_defconfig +0 -1
index de33abdeb6fa..9350925bc596 100644
@@ -14,7 +14,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
arch/arm/configs/simpad_defconfig +0 -1
index 28d99d8895f9..bb4450bfbd01 100644
@@ -24,7 +24,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=m
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
arch/arm/configs/sunxi_defconfig +0 -1
index df433abfcb02..15197a5da859 100644
@@ -28,7 +28,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_CAN=y
 CONFIG_CAN_SUN4I=y
 # CONFIG_WIRELESS is not set
arch/arm/configs/tango4_defconfig +0 -1
index 68725d4eae45..d3f31f27649e 100644
@@ -32,7 +32,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/arm/configs/trizeps4_defconfig +0 -1
index 2b5a224d2da1..4c81918e5fee 100644
@@ -35,7 +35,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_VLAN_8021Q=m
 CONFIG_IRDA=m
arch/arm/configs/versatile_defconfig +0 -1
index 5282324c7cef..c070055405de 100644
@@ -26,7 +26,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/arm/configs/vexpress_defconfig +0 -1
index 392ed3b3613c..ae26d12ab8c5 100644
@@ -42,7 +42,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
arch/arm/configs/viper_defconfig +0 -1
index 070e5074f1ee..845c38775fbd 100644
@@ -33,7 +33,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
arch/arm/configs/xcep_defconfig +0 -1
index 2eda24635e65..18cd60931277 100644
@@ -42,7 +42,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
arch/arm/configs/zeus_defconfig +0 -1
index 09e7050d5653..c4352e32a190 100644
@@ -28,7 +28,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_BT=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
arch/arm64/configs/defconfig +0 -1
index 2d9c39033c1a..e204d72bbfbc 100644
@@ -151,7 +151,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-CONFIG_IPV6=m
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_EVENTS=y
arch/hexagon/configs/comet_defconfig +0 -1
index e324f65f41e7..86ae09b576fa 100644
@@ -70,7 +70,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_HW is not set
arch/ia64/configs/bigsur_defconfig +0 -1
index b6bda1838629..c26fac2b23f4 100644
@@ -23,7 +23,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
arch/ia64/configs/generic_defconfig +0 -1
index 81f686dee53c..5b2fe38af787 100644
@@ -36,7 +36,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 # CONFIG_PNP_DEBUG_MESSAGES is not set
arch/ia64/configs/gensparse_defconfig +0 -1
index 5b4fcdd51457..37e5a66f3729 100644
@@ -32,7 +32,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
arch/ia64/configs/sim_defconfig +0 -1
index f0f69fdbddae..77c4e6f19124 100644
@@ -20,7 +20,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-# CONFIG_IPV6 is not set
 # CONFIG_STANDALONE is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
arch/ia64/configs/tiger_defconfig +0 -1
index 192ed157c9ce..b4a4c6e25f96 100644
@@ -37,7 +37,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
arch/ia64/configs/zx1_defconfig +0 -1
index b504c8e2fd52..90083faa175c 100644
@@ -23,7 +23,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
arch/m68k/configs/amcore_defconfig +0 -1
index 0857cdbfde0c..bffcd1a8db76 100644
@@ -32,7 +32,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_FW_LOADER is not set
arch/m68k/configs/amiga_defconfig +0 -1
index 525421ae277d..0ff23c910ec2 100644
@@ -76,7 +76,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/apollo_defconfig +0 -1
index db0e654a88d5..058854bf5e36 100644
@@ -72,7 +72,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/atari_defconfig +0 -1
index 1451168eb789..1ea42c016d78 100644
@@ -79,7 +79,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/bvme6000_defconfig +0 -1
index b0d3609f5bb3..b9b1f5470930 100644
@@ -69,7 +69,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/hp300_defconfig +0 -1
index 4ed7c151347c..1e39071a38b7 100644
@@ -71,7 +71,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/m5208evb_defconfig +0 -1
index a3102ff7e5ed..e6b854ec8ea0 100644
@@ -27,7 +27,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/m68k/configs/m5249evb_defconfig +0 -1
index f7bb9ed3efa8..27f5f1e73c30 100644
@@ -28,7 +28,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/m68k/configs/m5272c3_defconfig +0 -1
index 1e679f6a400f..b63dbfd45f78 100644
@@ -28,7 +28,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/m68k/configs/m5275evb_defconfig +0 -1
index d2987b40423e..391474eb0c90 100644
@@ -28,7 +28,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/m68k/configs/m5307c3_defconfig +0 -1
index 97a78c99eeee..48ec03723cf2 100644
@@ -28,7 +28,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/m68k/configs/m5407c3_defconfig +0 -1
index 766a97f39a3a..33c67b9e2c00 100644
@@ -29,7 +29,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/m68k/configs/mac_defconfig +0 -1
index 0dc544e1ce1f..70c1b2dd1de5 100644
@@ -70,7 +70,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/multi_defconfig +0 -1
index 5a7b7b0d6e72..3533f3bd873a 100644
@@ -90,7 +90,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/mvme147_defconfig +0 -1
index 71eb9be1803b..4538ac7a1eb2 100644
@@ -68,7 +68,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/mvme16x_defconfig +0 -1
index ea2ebd4241c0..0a8694810d25 100644
@@ -69,7 +69,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/q40_defconfig +0 -1
index cef6dc47c725..e19614f35916 100644
@@ -70,7 +70,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/sun3_defconfig +0 -1
index 69f2282dc4e9..5548cb759b7d 100644
@@ -66,7 +66,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/m68k/configs/sun3x_defconfig +0 -1
index e91267e868b2..18767afcd806 100644
@@ -66,7 +66,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 CONFIG_INET_RAW_DIAG=m
-CONFIG_IPV6=m
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
arch/microblaze/configs/mmu_defconfig +0 -1
index 92fd4e95b488..b0ce733a61b0 100644
@@ -31,7 +31,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_BRIDGE=m
 CONFIG_MTD=y
 CONFIG_MTD_CFI=y
arch/microblaze/configs/nommu_defconfig +0 -1
index 06d69a6e192d..a01f8a863d4b 100644
@@ -31,7 +31,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/mips/configs/ar7_defconfig +0 -1
index 9fbfb6e5c7d2..993a70789d9a 100644
@@ -43,7 +43,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_CUBIC is not set
 CONFIG_TCP_CONG_WESTWOOD=y
 # CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_BRIDGE_NETFILTER is not set
 CONFIG_NF_CONNTRACK=m
arch/mips/configs/ath25_defconfig +0 -1
index 5dd6b1939e9c..fc83ee64b140 100644
@@ -33,7 +33,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_DEBUGFS=y
arch/mips/configs/ath79_defconfig +0 -1
index 6f981af67826..04f40adf86da 100644
@@ -33,7 +33,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
 CONFIG_MAC80211_DEBUGFS=y
arch/mips/configs/bcm63xx_defconfig +0 -1
index d22fe62adad3..473e5858570f 100644
@@ -30,7 +30,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_CFG80211=y
 CONFIG_NL80211_TESTMODE=y
 CONFIG_MAC80211=y
arch/mips/configs/capcella_defconfig +0 -1
index 7bf8971af53b..b2ea55806942 100644
@@ -24,7 +24,6 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_IP_SCTP=m
 CONFIG_FW_LOADER=m
arch/mips/configs/ci20_defconfig +0 -1
index 412800d5d7e0..fc066295fe9a 100644
@@ -42,7 +42,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/mips/configs/cobalt_defconfig +0 -1
index 20c62841827f..5a9b9ac8ceef 100644
@@ -13,7 +13,6 @@ CONFIG_XFRM_USER=y
 CONFIG_NET_KEY=y
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_JEDECPROBE=y
arch/mips/configs/fuloong2e_defconfig +0 -1
index 8bcb61a6ec15..993ba50a260a 100644
@@ -39,7 +39,6 @@ CONFIG_NET_IPIP=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
arch/mips/configs/gpr_defconfig +0 -1
index 9d9af5f923c3..eab29dff15da 100644
@@ -32,7 +32,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_LOG=m
arch/mips/configs/ip28_defconfig +0 -1
index 0921ef38e9fb..d93579d6087c 100644
@@ -33,7 +33,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
arch/mips/configs/jmr3927_defconfig +0 -1
index 24b96faf9b4e..cca3efcf1b05 100644
@@ -16,7 +16,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CFI=y
arch/mips/configs/lasat_defconfig +0 -1
index c66ca3785655..00b49d5a7e6e 100644
@@ -26,7 +26,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
arch/mips/configs/loongson1b_defconfig +0 -1
index b064d68a5424..5f67c9bcc445 100644
@@ -33,7 +33,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/mips/configs/loongson1c_defconfig +0 -1
index 5d76559b56cd..c7d9c1cf5acf 100644
@@ -34,7 +34,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/mips/configs/mpc30x_defconfig +0 -1
index d4e038802510..15b20e6eea6f 100644
@@ -21,7 +21,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_CONNECTOR=m
 CONFIG_ATA_OVER_ETH=m
arch/mips/configs/msp71xx_defconfig +0 -1
index 0fdc03fda12e..655cca5cc192 100644
@@ -28,7 +28,6 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_FILTER=y
arch/mips/configs/omega2p_defconfig +0 -1
index 0649b8f06b7c..f296e9670b82 100644
@@ -40,7 +40,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/mips/configs/pnx8335_stb225_defconfig +0 -1
index aa0b169800e0..6aba5d7f5752 100644
@@ -24,7 +24,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_INET_AH=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/mips/configs/qi_lb60_defconfig +0 -1
index 7671fe6a8042..987ef2edbec5 100644
@@ -40,7 +40,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_CUBIC is not set
 CONFIG_TCP_CONG_WESTWOOD=y
 # CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/mips/configs/rb532_defconfig +0 -1
index 7befe05fd813..522775312487 100644
@@ -49,7 +49,6 @@ CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_BRIDGE_NETFILTER is not set
 CONFIG_NF_CONNTRACK=y
arch/mips/configs/rbtx49xx_defconfig +0 -1
index 50a2c9ad583f..813dd705f707 100644
@@ -28,7 +28,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/mips/configs/rt305x_defconfig +0 -1
index 0392e38010e6..15c49365dd03 100644
@@ -44,7 +44,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_BRIDGE_NETFILTER is not set
 CONFIG_NF_CONNTRACK=m
arch/mips/configs/sb1250_swarm_defconfig +0 -1
index ad8981666ee4..5b3c13071aea 100644
@@ -38,7 +38,6 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_TCP_MD5SIG=y
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
arch/mips/configs/tb0219_defconfig +0 -1
index f0a11a72307e..75a8015ce7f1 100644
@@ -26,7 +26,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_LOOP=m
arch/mips/configs/tb0226_defconfig +0 -1
index 025e45656359..97d769b743bb 100644
@@ -24,7 +24,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_LOOP=m
arch/mips/configs/tb0287_defconfig +0 -1
index 68490248e3f1..da3d38fa9167 100644
@@ -28,7 +28,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=y
 CONFIG_TCP_CONG_CUBIC=m
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_LOOP=m
arch/mips/configs/vocore2_defconfig +0 -1
index ded3dce911d5..1697ea9c956a 100644
@@ -40,7 +40,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/mips/configs/workpad_defconfig +0 -1
index 891a5f77305d..9d835e89e9e6 100644
@@ -23,7 +23,6 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_BLK_DEV_RAM=m
 CONFIG_IDE=y
arch/mips/configs/xway_defconfig +0 -1
index 2bb02ea9fb4e..796423ff2e3b 100644
@@ -46,7 +46,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_BRIDGE_NETFILTER is not set
 CONFIG_NF_CONNTRACK=m
arch/nds32/configs/defconfig +0 -1
index 65ce9259081b..6e73dd9596b7 100644
@@ -30,7 +30,6 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CADENCE is not set
arch/nios2/configs/10m50_defconfig +0 -1
index 7977ab7e2ca6..6e5688e145c8 100644
@@ -33,7 +33,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/nios2/configs/3c120_defconfig +0 -1
index ceb97cd85ac1..fa0fbf5ffd72 100644
@@ -35,7 +35,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/openrisc/configs/or1ksim_defconfig +0 -1
index d8ff4f8ffb88..06f2edc001c3 100644
@@ -29,7 +29,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_CUBIC is not set
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/openrisc/configs/simple_smp_defconfig +0 -1
index 64278992df9c..579df3a0fc49 100644
@@ -37,7 +37,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_CUBIC is not set
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/parisc/configs/712_defconfig +0 -1
index ccc109761f44..1b77dba998b4 100644
@@ -30,7 +30,6 @@ CONFIG_IP_PNP_BOOTP=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_DIAG=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_LLC2=m
 CONFIG_NET_PKTGEN=m
arch/parisc/configs/c8000_defconfig +0 -1
index 088ab948a5ca..9eb87a195b65 100644
@@ -51,7 +51,6 @@ CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
-# CONFIG_IPV6 is not set
 CONFIG_IP_DCCP=m
 # CONFIG_IP_DCCP_CCID3 is not set
 CONFIG_TIPC=m
arch/powerpc/configs/40x/acadia_defconfig +0 -1
index e57344c3b0d7..213540df7b99 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/40x/ep405_defconfig +0 -1
index 0f66f8a87be8..a06e4462c7bf 100644
@@ -20,7 +20,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/40x/kilauea_defconfig +0 -1
index b5cc7426c21f..af957cf4df03 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/40x/makalu_defconfig +0 -1
index e0b1489b7c7b..22ee64c44626 100644
@@ -20,7 +20,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/40x/obs600_defconfig +0 -1
index aac06d2ad01a..4b3ab5302026 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/40x/walnut_defconfig +0 -1
index 6faa03cd661c..73e924a5515c 100644
@@ -18,7 +18,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/akebono_defconfig +0 -1
index 9fcd361607e2..1f608af79ba4 100644
@@ -32,7 +32,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/powerpc/configs/44x/arches_defconfig +0 -1
index 6bba1a55b827..a54540c28626 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/bamboo_defconfig +0 -1
index 6f3a6ecc81e7..f0e77339d0b0 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_RAM=y
arch/powerpc/configs/44x/canyonlands_defconfig +0 -1
index c8e6f048a122..90f0183aba83 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/currituck_defconfig +0 -1
index 5f1df5fe4453..d73d4cec5aca 100644
@@ -30,7 +30,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/powerpc/configs/44x/ebony_defconfig +0 -1
index e2b6578993d5..04d1d9b31d82 100644
@@ -19,7 +19,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/eiger_defconfig +0 -1
index f6dc23fef683..0ed567dfcb75 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/fsp2_defconfig +0 -1
index bae6b26bcfba..0f56c083eb14 100644
@@ -42,7 +42,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
arch/powerpc/configs/44x/icon_defconfig +0 -1
index 4453a4590b1a..fa87e17c887d 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/iss476-smp_defconfig +0 -1
index d24bfa6ecd62..9ce5272fcb23 100644
@@ -32,7 +32,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/katmai_defconfig +0 -1
index 5d3f685a7af8..dab12ab932cf 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/rainier_defconfig +0 -1
index 7b8355a5698d..8e4a176557fb 100644
@@ -22,7 +22,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/redwood_defconfig +0 -1
index 918cfb63f0c8..68cb7911e5ad 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/sam440ep_defconfig +0 -1
index 63302fbd184d..b936b8544a61 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/44x/sequoia_defconfig +0 -1
index 1e04122912f3..50c467b245b8 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/taishan_defconfig +0 -1
index 42cc7b4ed95f..45edd7e77295 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
arch/powerpc/configs/44x/warp_defconfig +0 -1
index 6c02f53271cd..8cb3e169a35d 100644
@@ -23,7 +23,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_VLAN_8021Q=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/powerpc/configs/52xx/cm5200_defconfig +0 -1
index 73948e88ac82..a4a9a9b7eb0b 100644
@@ -22,7 +22,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/52xx/lite5200b_defconfig +0 -1
index 6fc7f786c83c..8a8b99cd03f9 100644
@@ -25,7 +25,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/52xx/motionpro_defconfig +0 -1
index ae2a1f74103b..02b5ad7d98cf 100644
@@ -22,7 +22,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/52xx/pcm030_defconfig +0 -1
index 1554de6968ca..b1b089240e3a 100644
@@ -35,7 +35,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/52xx/tqm5200_defconfig +0 -1
index 0777e6efd22d..27ab28f6a4ce 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/asp8347_defconfig +0 -1
index dd884df32dfd..74064dc24f1d 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/kmeter1_defconfig +0 -1
index d21b5cb365f2..f05f392f7f01 100644
@@ -28,7 +28,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_TIPC=y
 CONFIG_BRIDGE=m
 CONFIG_VLAN_8021Q=y
arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +0 -1
index 1f69f4edf074..50c1aff90bc1 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +0 -1
index 797fc3ffddee..899d5eddcee1 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/mpc832x_mds_defconfig +0 -1
index 4f914906ee4b..7ad0bc8110da 100644
@@ -25,7 +25,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +0 -1
index a484eb8401e8..3b84c7b63964 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/83xx/mpc834x_itx_defconfig +0 -1
index 37f4d93b3f81..d4af7d07e183 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +0 -1
index 7adb6708a761..726eee1fd050 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/mpc834x_mds_defconfig +0 -1
index d7ce3551529d..378ab1d81f73 100644
@@ -25,7 +25,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/83xx/mpc836x_mds_defconfig +0 -1
index 92134cee3f37..3cb93102682a 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +0 -1
index 97f7ea5f205f..00be519192b7 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/powerpc/configs/83xx/mpc837x_mds_defconfig +0 -1
index ee7510a33d06..36bc7e658b59 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +0 -1
index 8966a9af4230..6765774c1623 100644
@@ -25,7 +25,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/85xx/ksi8560_defconfig +0 -1
index 9ce6f48cfb61..0524a55d5817 100644
@@ -22,7 +22,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/85xx/mpc8540_ads_defconfig +0 -1
index 5fbc3f904046..4247f79a7307 100644
@@ -23,7 +23,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/85xx/mpc8560_ads_defconfig +0 -1
index ff981d7905c7..72e3d8892669 100644
@@ -22,7 +22,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +0 -1
index 974f0706d777..67886dbc74b8 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/85xx/sbc8548_defconfig +0 -1
index 7e3e84a842e4..57f6cbc0ec9f 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/85xx/socrates_defconfig +0 -1
index 6106fadbbd8b..15977b7b057c 100644
@@ -22,7 +22,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_CAN=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/powerpc/configs/85xx/stx_gp3_defconfig +0 -1
index 5b9cc01b9098..cf315d8398cc 100644
@@ -17,7 +17,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_FILTER=m
arch/powerpc/configs/85xx/tqm8540_defconfig +0 -1
index 98982a0e82d8..2a3f79bce6ff 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/powerpc/configs/85xx/tqm8541_defconfig +0 -1
index a6e21db1dafe..49b466d83af0 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/powerpc/configs/85xx/tqm8548_defconfig +0 -1
index 2697e4e8a761..43634a1c54f2 100644
@@ -28,7 +28,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/85xx/tqm8555_defconfig +0 -1
index ca1de3979474..e5ab9ae514c2 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/powerpc/configs/85xx/tqm8560_defconfig +0 -1
index ca3b8c8ef30f..a01645afc132 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/powerpc/configs/adder875_defconfig +0 -1
index 935ea3ade7de..6306178c7ad8 100644
@@ -25,7 +25,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/amigaone_defconfig +0 -1
index 12f397d403c6..a2839eb5f12e 100644
@@ -29,7 +29,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
arch/powerpc/configs/chrp32_defconfig +0 -1
index a203b1cf67d3..f82a875291c5 100644
@@ -30,7 +30,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
arch/powerpc/configs/ep88xc_defconfig +0 -1
index 7cb590e8f8fd..4f6f337562a9 100644
@@ -27,7 +27,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/fsl-emb-nonhw.config +0 -1
index d592ba27b122..d9149c135b8e 100644
@@ -71,7 +71,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_IP_SCTP=m
-CONFIG_IPV6=y
 CONFIG_ISO9660_FS=m
 CONFIG_JFFS2_FS_DEBUG=1
 CONFIG_JFFS2_FS=y
arch/powerpc/configs/g5_defconfig +0 -1
index ceb3c770786f..ac95c59d1e28 100644
@@ -40,7 +40,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
arch/powerpc/configs/gamecube_defconfig +0 -1
index 805b0f87653c..2f14e358963e 100644
@@ -33,7 +33,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
arch/powerpc/configs/holly_defconfig +0 -1
index 71d8d2430b6c..d650917664b5 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/linkstation_defconfig +0 -1
index 477794c41d50..3ca2af0a56bc 100644
@@ -23,7 +23,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_AMANDA=m
arch/powerpc/configs/maple_defconfig +0 -1
index c5f2005005d3..8e222c7b7de3 100644
@@ -35,7 +35,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
arch/powerpc/configs/mgcoge_defconfig +0 -1
index 5d5f08e5b8d9..da17bfa37f0e 100644
@@ -27,7 +27,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_TIPC=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/powerpc/configs/mpc512x_defconfig +0 -1
index e4bfb1101c0e..50370b091796 100644
@@ -29,7 +29,6 @@ CONFIG_IP_PNP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_CAN=y
 CONFIG_CAN_VCAN=y
 CONFIG_CAN_MSCAN=y
arch/powerpc/configs/mpc5200_defconfig +0 -1
index 7a2b2aa37def..cdb01eded150 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/powerpc/configs/mpc7448_hpc2_defconfig +0 -1
index 4b14c02b437c..2e41c4cc36e8 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/powerpc/configs/mpc83xx_defconfig +0 -1
index d1b82035d35f..31eae0a93ee0 100644
@@ -36,7 +36,6 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_SYN_COOKIES=y
 CONFIG_INET_ESP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/powerpc/configs/mpc866_ads_defconfig +0 -1
index 5320735395e7..703bdf1e2d23 100644
@@ -24,7 +24,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_IPV6 is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_NETDEVICES=y
 CONFIG_FS_ENET=y
arch/powerpc/configs/mpc885_ads_defconfig +0 -1
index ec3fcc2bf737..3eb0b3fd3990 100644
@@ -26,7 +26,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/powerpc/configs/mvme5100_defconfig +0 -1
index 63e38c7220f1..3e40326dc68f 100644
@@ -32,7 +32,6 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_AMANDA=m
arch/powerpc/configs/pasemi_defconfig +0 -1
index 6daa56f8895c..3c92931d5d40 100644
@@ -43,7 +43,6 @@ CONFIG_NET_IPIP=y
 CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/powerpc/configs/pmac32_defconfig +0 -1
index 50b610b48914..da84511319eb 100644
@@ -41,7 +41,6 @@ CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_CONNTRACK_FTP=m
arch/powerpc/configs/ppc64_defconfig +0 -1
index 91fdb619b484..dc61b3d91f9a 100644
@@ -89,7 +89,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
 CONFIG_BRIDGE=m
arch/powerpc/configs/ppc64e_defconfig +0 -1
index 41d85cb3c9a2..64f935c6c1a9 100644
@@ -46,7 +46,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
 CONFIG_BRIDGE=m
arch/powerpc/configs/pseries_defconfig +0 -1
index ea79c519863d..df9e82671e61 100644
@@ -73,7 +73,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
 CONFIG_BRIDGE=m
arch/powerpc/configs/storcenter_defconfig +0 -1
index 74bca2eccd0f..71bfd492029d 100644
@@ -25,7 +25,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/powerpc/configs/tqm8xx_defconfig +0 -1
index cd72193fac0a..32202c64046d 100644
@@ -30,7 +30,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
arch/powerpc/configs/wii_defconfig +0 -1
index f5c366b02828..e4c4c47d9b5d 100644
@@ -33,7 +33,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_BNEP=y
arch/sh/configs/ap325rxa_defconfig +0 -1
index 72b72e50a92e..56bf003bbf23 100644
@@ -27,7 +27,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/sh/configs/apsh4a3a_defconfig +0 -1
index 6c7cdc3beb28..db333f8aac6a 100644
@@ -27,7 +27,6 @@ CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
arch/sh/configs/apsh4ad0a_defconfig +0 -1
index 825c641726c4..969fd119db74 100644
@@ -52,7 +52,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_NET_KEY=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
arch/sh/configs/cayman_defconfig +0 -1
index 5a90e24aa8a6..d7bad9375bf6 100644
@@ -18,7 +18,6 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_LOOP=y
arch/sh/configs/dreamcast_defconfig +0 -1
index 1d27666c029f..9f8e7b64488e 100644
@@ -31,7 +31,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_FW_LOADER is not set
arch/sh/configs/ecovec24-romimage_defconfig +0 -1
index 0c5dfccbfe37..2729a846dfd9 100644
@@ -26,7 +26,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
arch/sh/configs/ecovec24_defconfig +0 -1
index 3568310c2c2f..f41b5c06ec3b 100644
@@ -28,7 +28,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_IRDA=y
 CONFIG_SH_SIR=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/sh/configs/edosk7760_defconfig +0 -1
index aab4ff1e247c..c8543fb6471c 100644
@@ -30,7 +30,6 @@ CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_DEBUG_DRIVER=y
arch/sh/configs/espt_defconfig +0 -1
index 444d75947e70..b4fc711fbc2e 100644
@@ -25,7 +25,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/sh/configs/kfr2r09-romimage_defconfig +0 -1
index 9cc37f29e3b4..46468be8d3c4 100644
@@ -26,7 +26,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_INPUT_MOUSEDEV is not set
arch/sh/configs/kfr2r09_defconfig +0 -1
index 46693d033644..e8ae482e8c7f 100644
@@ -33,7 +33,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
arch/sh/configs/landisk_defconfig +0 -1
index 467f4d2d8e87..ef2a33285df3 100644
@@ -23,7 +23,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_ATALK=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/sh/configs/lboxre2_defconfig +0 -1
index 9e3edfdf9b2e..07818aee5ec8 100644
@@ -27,7 +27,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_LOOP=y
arch/sh/configs/magicpanelr2_defconfig +0 -1
index fb7415dbc102..900644bbbd6e 100644
@@ -34,7 +34,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/sh/configs/microdev_defconfig +0 -1
index c3f7d5899922..9e605cded6be 100644
@@ -18,7 +18,6 @@ CONFIG_SUPERHYWAY=y
 CONFIG_NET=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_RAM=y
arch/sh/configs/migor_defconfig +0 -1
index e04f21be0756..26f37866f47e 100644
@@ -25,7 +25,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_FW_LOADER=m
 CONFIG_MTD=y
arch/sh/configs/polaris_defconfig +0 -1
index 87641b7d6c4e..1af76517e90c 100644
@@ -36,7 +36,6 @@ CONFIG_IP_MULTICAST=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/sh/configs/r7780mp_defconfig +0 -1
index 435bcd66c667..772c50063f59 100644
@@ -34,7 +34,6 @@ CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_BRIDGE=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_FW_LOADER=m
arch/sh/configs/r7785rp_defconfig +0 -1
index 5877e6d1f285..9a447bf4daf9 100644
@@ -41,7 +41,6 @@ CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_BRIDGE=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_FW_LOADER=m
arch/sh/configs/rsk7203_defconfig +0 -1
index 8c471959bbc7..1a9c7a25564c 100644
@@ -44,7 +44,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/sh/configs/rsk7264_defconfig +0 -1
index 2b9b731fc86b..c369bca9d904 100644
@@ -36,7 +36,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
arch/sh/configs/rsk7269_defconfig +0 -1
index d041f7bcb84c..841c56489330 100644
@@ -25,7 +25,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_SCSI=y
arch/sh/configs/rts7751r2d1_defconfig +0 -1
index 379d673f5ce8..e0edaf287612 100644
@@ -21,7 +21,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_FW_LOADER=m
 CONFIG_BLK_DEV_RAM=y
arch/sh/configs/rts7751r2dplus_defconfig +0 -1
index 11177bceda83..07b3e27c75fa 100644
@@ -21,7 +21,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_FW_LOADER=m
 CONFIG_MTD=y
arch/sh/configs/sdk7780_defconfig +0 -1
index 95e5208b8260..5d369dcdbd25 100644
@@ -38,7 +38,6 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_BEET is not set
 CONFIG_NET_SCHED=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/sh/configs/sdk7786_defconfig +0 -1
index d16e9334cd98..9d06495f2f2a 100644
@@ -89,7 +89,6 @@ CONFIG_NET_KEY=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
arch/sh/configs/se7206_defconfig +0 -1
index 3553acd5edb1..2f0d9506974e 100644
@@ -57,7 +57,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/sh/configs/se7343_defconfig +0 -1
index fc77a67b16e7..5ed438791b0f 100644
@@ -27,7 +27,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/sh/configs/se7705_defconfig +0 -1
index ddfc69841955..c7b835399b0b 100644
@@ -26,7 +26,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
arch/sh/configs/se7712_defconfig +0 -1
index 5a1097641247..4701c7cd4a01 100644
@@ -47,7 +47,6 @@ CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=y
 CONFIG_NET_SCH_HTB=y
arch/sh/configs/se7721_defconfig +0 -1
index 9c0ef13bee10..da2645894d3a 100644
@@ -46,7 +46,6 @@ CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=y
 CONFIG_NET_SCH_HTB=y
arch/sh/configs/se7722_defconfig +0 -1
index ccc7fc423fde..e8ced6392a58 100644
@@ -25,7 +25,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_BLK_DEV_RAM=y
arch/sh/configs/se7724_defconfig +0 -1
index aedb3a2d9a10..fbbe18b2f289 100644
@@ -29,7 +29,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/sh/configs/se7750_defconfig +0 -1
index b23f67542728..21be85432e88 100644
@@ -24,7 +24,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
arch/sh/configs/se7751_defconfig +0 -1
index 162343683937..804a2f02f06d 100644
@@ -24,7 +24,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/sh/configs/se7780_defconfig +0 -1
index ec32c82646ed..bed5922c7dbb 100644
@@ -24,7 +24,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
-CONFIG_IPV6=y
 # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET6_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET6_XFRM_MODE_BEET is not set
arch/sh/configs/secureedge5410_defconfig +0 -1
index 360592d63a2f..464039380dac 100644
@@ -18,7 +18,6 @@ CONFIG_INET=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK_RO=y
 CONFIG_MTD_CFI=y
arch/sh/configs/sh03_defconfig +0 -1
index 489ffdfb1517..1b806916158a 100644
@@ -33,7 +33,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
arch/sh/configs/sh2007_defconfig +0 -1
index a1cf6447dbb1..66df9df3ea69 100644
@@ -41,7 +41,6 @@ CONFIG_NET_IPIP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PKTGEN=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
arch/sh/configs/sh7710voipgw_defconfig +0 -1
index 65a1aad899c8..ccd5bd6cb2cc 100644
@@ -24,7 +24,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=y
arch/sh/configs/sh7757lcr_defconfig +0 -1
index b0c4bc830fb8..be0abef6f0a1 100644
@@ -31,7 +31,6 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-CONFIG_IPV6=y
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
arch/sh/configs/sh7763rdp_defconfig +0 -1
index 405bf62d22d0..95f872675929 100644
@@ -25,7 +25,6 @@ CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
arch/sh/configs/sh7785lcr_32bit_defconfig +0 -1
index 2ddf5ca7094e..778955a4d287 100644
@@ -43,7 +43,6 @@ CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
arch/sh/configs/sh7785lcr_defconfig +0 -1
index 5201bb78c6f9..0f3e93ad5c06 100644
@@ -25,7 +25,6 @@ CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/sh/configs/shmin_defconfig +0 -1
index d589cfdfb7eb..81fef83d1f29 100644
@@ -27,7 +27,6 @@ CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
-# CONFIG_IPV6 is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
arch/sh/configs/titan_defconfig +0 -1
index ceb48e9b70f4..32d732a6de79 100644
@@ -49,7 +49,6 @@ CONFIG_INET_AH=y
 CONFIG_INET_ESP=y
 CONFIG_INET_IPCOMP=y
 CONFIG_INET_DIAG=m
-CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
arch/sh/configs/ul2_defconfig +0 -1
index 1b7412df12e0..2993b43bbae9 100644
@@ -28,7 +28,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_MAC80211_RC_PID=y
arch/sh/configs/urquell_defconfig +0 -1
index f891045e633a..7ed908a3788b 100644
@@ -45,7 +45,6 @@ CONFIG_INET=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-# CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
arch/um/configs/i386_defconfig +0 -1
index 8f114e3b0a7a..72b2a7036ced 100644
@@ -53,7 +53,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UML_NET=y
 CONFIG_UML_NET_ETHERTAP=y
 CONFIG_UML_NET_TUNTAP=y
arch/um/configs/x86_64_defconfig +0 -1
index 5d0875fc0db2..a1d5c6833eb2 100644
@@ -51,7 +51,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
-# CONFIG_IPV6 is not set
 CONFIG_UML_NET=y
 CONFIG_UML_NET_ETHERTAP=y
 CONFIG_UML_NET_TUNTAP=y
arch/unicore32/configs/unicore32_defconfig +0 -1
index aebd01fc28e5..c88acf2d835d 100644
@@ -51,7 +51,6 @@ CONFIG_UNIX=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
-CONFIG_IPV6=n
 #	Wireless
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
arch/x86/configs/i386_defconfig +0 -1
index 9f908112bbb9..2673b3f89018 100644
@@ -103,7 +103,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_NETLABEL=y
arch/x86/configs/x86_64_defconfig +0 -1
index 1d3badfda09e..ae4465dee1d1 100644
@@ -102,7 +102,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_NETLABEL=y
arch/xtensa/configs/audio_kc705_defconfig +0 -1
index f378e56f9ce6..8b5d83650cb6 100644
@@ -47,7 +47,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
arch/xtensa/configs/cadence_csp_defconfig +0 -1
index 62f32a902568..d269310b987f 100644
@@ -55,7 +55,6 @@ CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
arch/xtensa/configs/common_defconfig +0 -1
index fa9389869154..fcc349622eb9 100644
@@ -21,7 +21,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_HTB=m
arch/xtensa/configs/generic_kc705_defconfig +0 -1
index 8bebe07f1060..994667b2fe3f 100644
@@ -45,7 +45,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
arch/xtensa/configs/iss_defconfig +0 -1
index 4bb5b76d9524..0ae5bed48ab0 100644
@@ -16,7 +16,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 # CONFIG_STANDALONE is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
arch/xtensa/configs/nommu_kc705_defconfig +0 -1
index 933ab2adf434..cf54a3996f6c 100644
@@ -50,7 +50,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
arch/xtensa/configs/smp_lx200_defconfig +0 -1
index e29c5b179a5b..de13be474e9f 100644
@@ -50,7 +50,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
-# CONFIG_IPV6 is not set
 CONFIG_NETFILTER=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
kernel/configs/android-base.config +0 -1
index d3fd428f4b92..0dab4de384d3 100644
@@ -42,7 +42,6 @@ CONFIG_IP6_NF_IPTABLES=y
 CONFIG_IP6_NF_MANGLE=y
 CONFIG_IP6_NF_RAW=y
 CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IPV6=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
tools/testing/selftests/bpf/config +0 -1
index a42f4fc4dc11..651576cc0550 100644
@@ -9,7 +9,6 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_INGRESS=y
 CONFIG_NET_IPIP=y
-CONFIG_IPV6=y
 CONFIG_NET_IPGRE_DEMUX=y
 CONFIG_NET_IPGRE=y
 CONFIG_IPV6_GRE=y
tools/testing/selftests/net/config +0 -1
index e9c860d00416..9c917863653b 100644
@@ -4,7 +4,6 @@ CONFIG_TEST_BPF=m
 CONFIG_NUMA=y
 CONFIG_NET_VRF=y
 CONFIG_NET_L3_MASTER_DEV=y
-CONFIG_IPV6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_VETH=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
maintainer
#2 lore raw
In reply to Maciej Żenczykowski

From: Maciej Żenczykowski <[email protected]>
Date: Mon, 1 Apr 2019 12:44:58 -0700

Quoted 10 lines

From: Maciej Żenczykowski <[email protected]>

IPv6 is 20 years old and IPv4 has run out of IP addresses and is deprecated.

It is time to make IPv6 a first class citizen.

As such we remove the ability to compile IPv6 as a module, and IPv4 support now implies IPv6 support.

Quoted 8 lines

This has the nice benefit of allowing upcoming code simplification:
all IPv6 module support can be removed, and we'll be able to merge IPv6 socket state into the base IPv4 socket state...

At some point we should be able to reverse things and make IPv4 the optional protocol and possibly even make an ipv4.ko.

Things are modular because we don't unilaterally make decisions for people on this level.

This is why I'm very much not too motivated to integrate changes like this, even though I understand the motivation and simplifications this would enable.

I mean, who the heck are we to tell someone that because they make some tiny device meant for an isolated ipv4 environment that they _MUST_ have ipv6 also built into their kernels?

Seriously...

#3 lore raw
Quoted 2 lines

Things are modular because we don't unilaterally make decisions for people on this level.

We do unilaterally make various decisions - some of them quite big in scope. Although perhaps not this one.

Quoted 7 lines

This is why I'm very much not too motivated to integrate changes like this, even though I understand the motivation and simplifications this would enable.

I mean, who the heck are we to tell someone that because they make some tiny device meant for an isolated ipv4 environment that they _MUST_ have ipv6 also built into their kernels?

One of the major reasons why ipv6 is seeing such slow adoption is because people keep manufacturing ipv4 only devices. It's just a stupid network attached
sensor, but it doesn't work on your network because it doesn't support ipv6... and as a result you need to keep around legacy ipv4 support.

Why should the manufacturers be allowed to tell me how to run my network?

These small devices are unlikely to be even running a 5.2+ kernel for another half decade or more.

ie. we're talking about hardware that'll come to market 3-4 years from now, at the earliest, probably later, since no one updates the kernel/software on these
devices after they initially start shipping.

If they truly need something so tiny and so ipv6 unsupporting, they can simply run 5.1 or older.
It's not like we'll delete the source code for older versions of Linux.

---

Perhaps just making ipv6 a boolean instead of a tristate would be acceptable?

That would get rid of most of the craziness with supporting loading ipv6 as a module,
the checks for is this function null, etc. and we could still move all the fields into
the main ip struct just surrounded by #ifdef IPV6

maintainer
#4 lore raw

From: Maciej Żenczykowski <[email protected]>
Date: Mon, 1 Apr 2019 14:02:09 -0700

Quoted 2 lines

Why should the manufacturers be allowed to tell me how to run my network?

He isn't, unless he forced you to buy his device?

This is like how various "internet pioneers" complain about how google products do DNS directly to 8.8.8.8 and 8.8.4.4, instead of simply not buying Google's products.

Touche'.

#5 lore raw
In reply to Maciej Żenczykowski
Quoted 25 lines · Maciej Żenczykowski
Quoted 2 lines

Things are modular because we don't unilaterally make decisions for people on this level.

We do unilaterally make various decisions - some of them quite big in scope. Although perhaps not this one.

Quoted 7 lines

This is why I'm very much not too motivated to integrate changes like this, even though I understand the motivation and simplifications this would enable.

I mean, who the heck are we to tell someone that because they make some tiny device meant for an isolated ipv4 environment that they _MUST_ have ipv6 also built into their kernels?

One of the major reasons why ipv6 is seeing such slow adoption is because people keep manufacturing ipv4 only devices. It's just a stupid network attached
sensor, but it doesn't work on your network because it doesn't support ipv6... and as a result you need to keep around legacy ipv4 support.

Why should the manufacturers be allowed to tell me how to run my network?

These small devices are unlikely to be even running a 5.2+ kernel for another half decade or more.

Quoted 7 lines

ie. we're talking about hardware that'll come to market 3-4 years from now, at the earliest, probably later, since no one updates the kernel/software on these
devices after they initially start shipping.

If they truly need something so tiny and so ipv6 unsupporting, they can simply run 5.1 or older.

You can't use your own argument both ways and complain that people design devices that are never upgraded and then just give them another argument for not updating because IPv6 simply makes them make an unacceptable decision which could be either of:

- creating another attack surface they had not thought about initially

- making their memory budget explode to the point where a new kernel becomes out of the equation, period

- the product is simply not meeting the requirements of *not* supporting IPv6 (granted it could be a stupid requirement, yet be one)

Quoted 1 line

It's not like we'll delete the source code for older versions of Linux.

No, but it is another roadblock to upstreaming changes for your embedded device if you need to make a few tweaks here and there. And given the direction you want to go later on, it won't be as simple as a revert of your patches to go back to hypothetical pre-5.1 behavior.

Quoted 11 lines

---

Perhaps just making ipv6 a boolean instead of a tristate would be acceptable?

That would get rid of most of the craziness with supporting loading ipv6 as a module,
the checks for is this function null, etc. and we could still move all the fields into
the main ip struct just surrounded by #ifdef IPV6

Are you seeing a performance problem where having IPv6 be built-in and all code being reachable would help, or are you trying to improve the maintenance burden, or is it something else?

Signature · 1 line
Florian
#6 lore raw
In reply to Maciej Żenczykowski
Quoted 5 lines · Maciej Żenczykowski

From: Maciej Żenczykowski <[email protected]>

IPv6 is 20 years old and IPv4 has run out of IP addresses and is deprecated.

Quoted 7 lines

It is time to make IPv6 a first class citizen.

As such we remove the ability to compile IPv6 as a module, and IPv4 support now implies IPv6 support.>
This has the nice benefit of allowing upcoming code simplification:
all IPv6 module support can be removed, and we'll be able to merge IPv6 socket state into the base IPv4 socket state...

If you exclude size increase for the built-in part of the kernel, yes, it's all beneficial.

There are tons of systems where IPv6 will likely never be used, let's face it, so why kill the ability to insmod the IPv6 stack since it really does not come at the cost of trying to fix the unloading part already?

I am not convinced this is solving any problems TBH...

Quoted 27 lines

At some point we should be able to reverse things and make IPv4 the optional protocol and possibly even make an ipv4.ko.

---
 net/Kconfig      | 1 +
 net/ipv6/Kconfig | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)
net/Kconfig +1 -0
index 3e8fdd688329..0f2ca2137f9e 100644
@@ -68,6 +68,7 @@ config INET
 	bool "TCP/IP networking"
 	select CRYPTO
 	select CRYPTO_AES
+	select IPV6
 	---help---
 	  These are the protocols used on the Internet and on most local
 	  Ethernets. It is highly recommended to say Y here (this will enlarge
net/ipv6/Kconfig +0 -0
index 613282c65a10..9197f496a112 100644

net/ipv6/Kconfig line 6

Quoted 8 lines
net/ipv6/Kconfig +1 -3
@@ -2,10 +2,8 @@
 # IPv6 configuration
 #
 
-#   IPv6 as module will cause a CRASH if you try to unload it
 menuconfig IPV6
-	tristate "The IPv6 protocol"
-	default y
+	bool "The IPv6 protocol"

Huh, no, please? If you need IPv6 make it built-in to your kernel, but don't bother people taht

Quoted 14 lines
net/ipv6/Kconfig +0 -3
 	---help---
 	  Support for IP version 6 (IPv6).
 
@@ -15,9 +13,6 @@ menuconfig IPV6
 	  Documentation/networking/ipv6.txt and read the HOWTO at
 	  <http://www.tldp.org/HOWTO/Linux+IPv6-HOWTO/>
 
-	  To compile this protocol support as a module, choose M here: the
-	  module will be called ipv6.
-
 if IPV6
 
 config IPV6_ROUTER_PREF
Signature · 1 line
Florian
maintainer
#7 lore raw

From: Florian Fainelli <[email protected]>
Date: Mon, 1 Apr 2019 14:37:25 -0700

Quoted 6 lines

There are tons of systems where IPv6 will likely never be used, let's face it, so why kill the ability to insmod the IPv6 stack since it really does not come at the cost of trying to fix the unloading part already?

I am not convinced this is solving any problems TBH...

I agree.

Saying everyone must be doing ipv6 3 to 4 years from now is the height of arrogance.

And maybe it is this arrogance of people pushing ipv6 that blocks widespread ipv6 adoption rather than any technical reasons.

That's nice on your network, but don't tell me what's appropriate or useful on mine. And ironically the "don't tell me what to do on my network" argument was used as justification for this change.

It cuts both ways.