Merge branch 'linus' into cpus4096-for-linus

Conflicts:

	net/sunrpc/svc.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 10 insertions, 0 deletions

diff --git a/net/8021q/Kconfig b/net/8021q/Kconfig
index c4a382e450e2..fa073a54963e 100644
--- a/net/8021q/Kconfig
+++ b/net/8021q/Kconfig
@@ -17,3 +17,13 @@ config VLAN_8021Q
           will be called 8021q.
 
           If unsure, say N.
+
+config VLAN_8021Q_GVRP
+        bool "GVRP (GARP VLAN Registration Protocol) support"
+        depends on VLAN_8021Q
+        select GARP
+        help
+          Select this to enable GVRP end-system support. GVRP is used for
+          automatic propagation of registered VLANs to switches.
+
+          If unsure, say N.