David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
bat_algo.c
bat_algo.h
bat_iv_ogm.c	batman-adv: Move OGM rebroadcast stats to orig_ifinfo	2018-09-15 09:51:10 +02:00
bat_iv_ogm.h	batman-adv: Unify include guards style	2018-07-07 22:02:17 +02:00
bat_v_elp.c	batman-adv: fix hardif_neigh refcount on queue_work() failure	2018-09-07 08:14:26 +02:00
bat_v_elp.h
bat_v_ogm.c
bat_v_ogm.h	batman-adv: Unify include guards style	2018-07-07 22:02:17 +02:00
bat_v.c	batman-adv: Fix bat_v best gw refcnt after netlink dump	2018-06-23 10:29:33 +02:00
bat_v.h
bitarray.c
bitarray.h
bridge_loop_avoidance.c	batman-adv: fix backbone_gw refcount on queue_work() failure	2018-09-07 08:14:26 +02:00
bridge_loop_avoidance.h
debugfs.c	batman-adv: Mark debugfs functionality as deprecated	2018-09-14 10:50:26 +02:00
debugfs.h	batman-adv: Mark debugfs functionality as deprecated	2018-09-14 10:50:26 +02:00
distributed-arp-table.c
distributed-arp-table.h
fragmentation.c
fragmentation.h
gateway_client.c	batman-adv: Prevent duplicated gateway_node entry	2018-09-06 13:55:20 +02:00
gateway_client.h
gateway_common.c
gateway_common.h
hard-interface.c	batman-adv: Move OGM rebroadcast stats to orig_ifinfo	2018-09-15 09:51:10 +02:00
hard-interface.h
hash.c
hash.h
icmp_socket.c	batman-adv: Mark debugfs functionality as deprecated	2018-09-14 10:50:26 +02:00
icmp_socket.h
Kconfig	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02:00
log.c	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02:00
log.h
main.c
main.h	batman-adv: Increase version number to 2018.3	2018-09-14 17:59:20 +02:00
Makefile	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02:00
multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
multicast.h
netlink.c
netlink.h
network-coding.c	batman-adv: Prevent duplicated nc_node entry	2018-09-06 13:55:58 +02:00
network-coding.h
originator.c	batman-adv: Move OGM rebroadcast stats to orig_ifinfo	2018-09-15 09:51:10 +02:00
originator.h	batman-adv: Move OGM rebroadcast stats to orig_ifinfo	2018-09-15 09:51:10 +02:00
routing.c
routing.h
send.c
send.h
soft-interface.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
soft-interface.h
sysfs.c	batman-adv: Fix segfault when writing to sysfs elp_interval	2018-09-06 13:54:48 +02:00
sysfs.h
tp_meter.c
tp_meter.h
trace.c	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02:00
trace.h	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02:00
translation-table.c	batman-adv: Prevent duplicated global TT entry	2018-09-06 14:37:12 +02:00
translation-table.h
tvlv.c	batman-adv: Prevent duplicated tvlv handler	2018-09-06 14:37:13 +02:00
tvlv.h
types.h	batman-adv: Move OGM rebroadcast stats to orig_ifinfo	2018-09-15 09:51:10 +02:00