David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... All conflicts seemed rather trivial, with some guidance from Saeed Mameed on the tc_ct.c one. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-07-11 00:46:00 -07:00
..
hsr_debugfs.c	hsr: use debugfs_remove_recursive() instead of debugfs_remove()	2020-02-29 21:37:03 -08:00
hsr_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-07-11 00:46:00 -07:00
hsr_device.h	hsr: avoid to create proc file after unregister	2020-06-22 20:42:23 -07:00
hsr_forward.c	hsr: remove WARN_ONCE() in hsr_fill_frame_info()	2020-05-07 17:40:02 -07:00
hsr_forward.h	net: hsr: convert to SPDX identifier	2019-04-06 18:32:21 -07:00
hsr_framereg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-03-25 18:58:11 -07:00
hsr_framereg.h	hsr: fix a race condition in node list insertion and deletion	2019-12-25 16:35:35 -08:00
hsr_main.c	hsr: avoid to create proc file after unregister	2020-06-22 20:42:23 -07:00
hsr_main.h	net: hsr: remove unused inline functions	2020-04-29 12:00:35 -07:00
hsr_netlink.c	hsr: avoid to create proc file after unregister	2020-06-22 20:42:23 -07:00
hsr_netlink.h	net: hsr: convert to SPDX identifier	2019-04-06 18:32:21 -07:00
hsr_slave.c	net: hsr: fix incorrect type usage for protocol variable	2020-05-06 15:00:20 -07:00
hsr_slave.h	hsr: use extack error message instead of netdev_info	2020-02-29 21:37:03 -08:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00