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
..
Kconfig	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02:00
Makefile	batman-adv: Provide debug messages as trace events	2018-09-15 09:51:08 +02: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	…
bat_v.c	…
bat_v.h	…
bat_v_elp.c	…
bat_v_elp.h	…
bat_v_ogm.c	…
bat_v_ogm.h	…
bitarray.c	…
bitarray.h	…
bridge_loop_avoidance.c	…
bridge_loop_avoidance.h	…
debugfs.c	…
debugfs.h	…
distributed-arp-table.c	…
distributed-arp-table.h	…
fragmentation.c	…
fragmentation.h	…
gateway_client.c	…
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	…
icmp_socket.h	…
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
multicast.c	…
multicast.h	…
netlink.c	…
netlink.h	…
network-coding.c	…
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	…
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	…
translation-table.h	…
tvlv.c	…
tvlv.h	…
types.h	batman-adv: Move OGM rebroadcast stats to orig_ifinfo	2018-09-15 09:51:10 +02:00