David S. Miller a2d6d7ae59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-01-09 12:13:43 -08:00
..
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	net: remove blank lines at end of file	2018-07-24 14:10:43 -07:00
vlan_core.c	net: 8021q: move vlan offload registrations into vlan_core	2018-11-16 19:51:08 -08:00
vlan_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-01-09 12:13:43 -08:00
vlan_gvrp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
vlan_mvrp.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
vlan_netlink.c	vlan: vlan_changelink() should propagate errors	2020-01-07 13:35:14 -08:00
vlan.c	net: remove unnecessary variables and callback	2019-10-24 14:53:49 -07:00
vlan.h	vlan: fix memory leak in vlan_dev_set_egress_priority	2020-01-07 13:35:14 -08:00
vlanproc.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
vlanproc.h