Enable CONFIG_NET_L3_MASTER_DEV (rhbz 1428530)

23 files changed, 45 insertions, 21 deletions

diff --git a/baseconfig/CONFIG_IPVTAP b/baseconfig/CONFIG_IPVTAP
new file mode 100644
index 000000000..4bb385673
--- /dev/null
+++ b/baseconfig/CONFIG_IPVTAP
@@ -0,0 +1 @@
+CONFIG_IPVTAP=m
diff --git a/baseconfig/CONFIG_NET_L3_MASTER_DEV b/baseconfig/CONFIG_NET_L3_MASTER_DEV
index c5825b130..bdf39009e 100644
--- a/baseconfig/CONFIG_NET_L3_MASTER_DEV
+++ b/baseconfig/CONFIG_NET_L3_MASTER_DEV
@@ -1 +1 @@
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index dd11adea2..a592de789 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2348,6 +2348,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3374,7 +3375,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index be12e2d7c..f016a2d3a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2331,6 +2331,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3353,7 +3354,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 8283a7a89..e81fd48a3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2518,6 +2518,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3634,7 +3635,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index ac1a21e1e..47f8f4198 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2406,6 +2406,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3481,7 +3482,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 6683d8660..180df196a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2389,6 +2389,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3460,7 +3461,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 76f3d6e24..de13839b8 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2501,6 +2501,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3613,7 +3614,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index c8dff4177..b53e98e14 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2257,6 +2257,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3265,7 +3266,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 39b2d2112..f1efa87b8 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2275,6 +2275,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3285,7 +3286,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 96767b822..168b2946f 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2275,6 +2275,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3285,7 +3286,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 5fedc8086..2e327eb17 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2257,6 +2257,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3265,7 +3266,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index bf752d598..2a642ec6d 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2157,6 +2157,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3136,7 +3137,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index c9e173d34..9179d39da 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2139,6 +2139,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3114,7 +3115,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 7366920b4..430972dfa 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2103,6 +2103,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3081,7 +3082,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 957131710..ea1339635 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2085,6 +2085,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3059,7 +3060,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 2df1d3c19..f9f4bd40e 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2102,6 +2102,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3080,7 +3081,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index f2a20c620..290075ce2 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2084,6 +2084,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3058,7 +3059,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 2c5dc1ef3..a8b5f928b 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2054,6 +2054,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -3014,7 +3015,7 @@ CONFIG_NET_IPVTI=m
 # CONFIG_NETIUCV is not set
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2eb66a35b..f1d9ef696 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2036,6 +2036,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200_DEBUG is not set
@@ -2992,7 +2993,7 @@ CONFIG_NET_IPVTI=m
 # CONFIG_NETIUCV is not set
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 154448383..b5380420a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2311,6 +2311,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3308,7 +3309,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 357102b0d..9e1aea9a3 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2293,6 +2293,7 @@ CONFIG_IP_VS_SH_TAB_BITS=8
 CONFIG_IP_VS_TAB_BITS=12
 CONFIG_IP_VS_WLC=m
 CONFIG_IP_VS_WRR=m
+CONFIG_IPVTAP=m
 # CONFIG_IPW2100_DEBUG is not set
 CONFIG_IPW2100=m
 CONFIG_IPW2100_MONITOR=y
@@ -3288,7 +3289,7 @@ CONFIG_NET_IPIP=m
 CONFIG_NET_IPVTI=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_L3_MASTER_DEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
 CONFIG_NETLABEL=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_NET_MPLS_GSO=m
diff --git a/kernel.spec b/kernel.spec
index 1d0d8cc66..9bd7e2ff1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2166,6 +2166,9 @@ fi
 #
 #
 %changelog
+* Thu Mar 02 2017 Laura Abbott <labbott@fedoraproject.org>
+- Enable CONFIG_NET_L3_MASTER_DEV (rhbz 1428530)
+
 * Thu Mar 02 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git8.1
 - Linux v4.10-11073-g4977ab6