aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira <pablo@netfilter.org>2017-03-15 13:39:46 -0400
committerDavid S. Miller <davem@davemloft.net>2017-03-15 18:15:07 -0400
commit88d339e2d3be955848a034970970931a7ed33956 (patch)
tree65a470c119fa7266286a88ab2a664aaae0c017d4
parente11607aad5edf4c41617a27291731c660f7d519d (diff)
MAINTAINERS: remove MACVLAN and VLAN entries
macvlan.c file seems to be both in VLAN and MACVLAN DRIVER, so remove the MACVLAN DRIVER since this is redundant. I propose with this patch to remove the VLAN (802.1Q) entry so this just falls into the NETWORKING [GENERAL]. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--MAINTAINERS15
1 files changed, 0 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c776906f67a9..33875e07482b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7774,13 +7774,6 @@ F: include/net/mac80211.h
7774F: net/mac80211/ 7774F: net/mac80211/
7775F: drivers/net/wireless/mac80211_hwsim.[ch] 7775F: drivers/net/wireless/mac80211_hwsim.[ch]
7776 7776
7777MACVLAN DRIVER
7778M: Patrick McHardy <kaber@trash.net>
7779L: netdev@vger.kernel.org
7780S: Maintained
7781F: drivers/net/macvlan.c
7782F: include/linux/if_macvlan.h
7783
7784MAILBOX API 7777MAILBOX API
7785M: Jassi Brar <jassisinghbrar@gmail.com> 7778M: Jassi Brar <jassisinghbrar@gmail.com>
7786L: linux-kernel@vger.kernel.org 7779L: linux-kernel@vger.kernel.org
@@ -13383,14 +13376,6 @@ W: https://linuxtv.org
13383S: Maintained 13376S: Maintained
13384F: drivers/media/platform/vivid/* 13377F: drivers/media/platform/vivid/*
13385 13378
13386VLAN (802.1Q)
13387M: Patrick McHardy <kaber@trash.net>
13388L: netdev@vger.kernel.org
13389S: Maintained
13390F: drivers/net/macvlan.c
13391F: include/linux/if_*vlan.h
13392F: net/8021q/
13393
13394VLYNQ BUS 13379VLYNQ BUS
13395M: Florian Fainelli <f.fainelli@gmail.com> 13380M: Florian Fainelli <f.fainelli@gmail.com>
13396L: openwrt-devel@lists.openwrt.org (subscribers-only) 13381L: openwrt-devel@lists.openwrt.org (subscribers-only)