set CONFIG_BRIDGE=y

To avoid systcl warning at boot time.

diff --git a/config-3.10.0.diff b/config-3.10.0.diff
index 588e0c68983928cccde074c2dc8aa9f6cac241f1..4d2b605144bb2f8213713a151523adba00491a69 100644 (file)
--- a/config-3.10.0.diff
+++ b/config-3.10.0.diff
@@ -1,6 +1,15 @@
---- rh-kernel-src/kernel-3.10.0-x86_64.config  2013-12-12 11:09:13.000000000 +0100
-+++ linux-2.6-3.10.0/.config   2013-12-13 16:05:21.060958142 +0100
-@@ -1431,7 +1430,8 @@
+--- rh-kernel-src/kernel-3.10.0-x86_64.config  2013-12-16 08:05:07.513206660 +0100
++++ config-3.10.0      2013-12-17 09:46:34.343121619 +0100
+@@ -1125,7 +1125,7 @@
+ CONFIG_STP=m
+ CONFIG_GARP=m
+ CONFIG_MRP=m
+-CONFIG_BRIDGE=m
++CONFIG_BRIDGE=y
+ CONFIG_BRIDGE_IGMP_SNOOPING=y
+ CONFIG_BRIDGE_VLAN_FILTERING=y
+ CONFIG_HAVE_NET_DSA=y
+@@ -1431,7 +1431,8 @@
  CONFIG_BLK_DEV_LOOP=m
  CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -10,7 +19,7 @@
  # CONFIG_BLK_DEV_NBD is not set
  CONFIG_BLK_DEV_NVME=m
  CONFIG_BLK_DEV_OSD=m
-@@ -5208,6 +5208,7 @@
+@@ -5208,6 +5209,7 @@
  CONFIG_DQL=y
  CONFIG_NLATTR=y
  CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y