David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The UDP offload conflict is dealt with by simply taking what is in net-next where we have removed all of the UFO handling code entirely. The TCP conflict was a case of local variables in a function being removed from both net and net-next. In netvsc we had an assignment right next to where a missing set of u64 stats sync object inits were added. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-09 16:28:45 -07:00
..
Kconfig	batman-adv: Allow selecting BATMAN V if CFG80211 is not built	2016-10-17 16:28:48 +02:00
Makefile	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bat_algo.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bat_algo.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bat_iv_ogm.c	batman-adv: Remove variable deprecated by skb_put_data	2017-07-29 09:51:27 +02:00
bat_iv_ogm.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bat_v.c	batman-adv: Replace a seq_puts() call by seq_putc() in two functions	2017-05-23 12:09:14 +02:00
bat_v.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bat_v_elp.c	networking: convert many more places to skb_put_zero()	2017-06-16 11:48:35 -04:00
bat_v_elp.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bat_v_ogm.c	batman-adv: fix various spelling mistakes	2017-07-29 09:51:28 +02:00
bat_v_ogm.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bitarray.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bitarray.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
bridge_loop_avoidance.c	batman-adv: Print correct function names in dbg messages	2017-05-23 14:34:31 +02:00
bridge_loop_avoidance.h	batman-adv: prevent multiple ARP replies sent by gateways if dat enabled	2017-03-22 10:30:53 +01:00
debugfs.c	batman-adv: Fix includes for IS_ERR/ERR_PTR	2017-01-28 10:40:35 +01:00
debugfs.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
distributed-arp-table.c	batman-adv: Remove unnecessary length qualifier in %14pM	2017-07-29 09:51:26 +02:00
distributed-arp-table.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
fragmentation.c	networking: introduce and use skb_put_data()	2017-06-16 11:48:37 -04:00
fragmentation.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
gateway_client.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
gateway_client.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
gateway_common.c	Here are two batman-adv bugfixes:	2017-03-16 12:05:38 -07:00
gateway_common.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
hard-interface.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
hard-interface.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
hash.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
hash.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
icmp_socket.c	networking: make skb_put & friends return void pointers	2017-06-16 11:48:39 -04:00
icmp_socket.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
log.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
log.h	batman-adv: Fix possible side-effects in _batadv_dbg	2017-03-16 21:14:52 +01:00
main.c	batman-adv: restructure rebroadcast counter into forw_packet API	2017-03-26 12:46:44 +02:00
main.h	batman-adv: Start new development cycle	2017-07-29 09:51:25 +02:00
multicast.c	batman-adv: Reduce preprocessor checks in multicast.c	2017-03-16 21:14:50 +01:00
multicast.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
netlink.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
netlink.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
network-coding.c	batman-adv: Combine two seq_puts() calls into one call in batadv_nc_nodes_seq_print_text()	2017-05-23 12:09:15 +02:00
network-coding.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
originator.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
originator.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
packet.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
routing.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
routing.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
send.c	batman-adv: fix various spelling mistakes	2017-07-29 09:51:28 +02:00
send.h	batman-adv: restructure rebroadcast counter into forw_packet API	2017-03-26 12:46:44 +02:00
soft-interface.c	net: Fix inconsistent teardown and release of private netdev state.	2017-06-07 15:53:24 -04:00
soft-interface.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
sysfs.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
sysfs.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
tp_meter.c	networking: make skb_put & friends return void pointers	2017-06-16 11:48:39 -04:00
tp_meter.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
translation-table.c	batman-adv: fix TT sync flag inconsistencies	2017-07-31 11:17:38 +02:00
translation-table.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
tvlv.c	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
tvlv.h	batman-adv: update copyright years for 2017	2017-01-26 08:34:19 +01:00
types.h	batman-adv: fix TT sync flag inconsistencies	2017-07-31 11:17:38 +02:00