linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-14 17:14:09 +00:00

History

David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04: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: Print correct function names in dbg messages

2017-05-23 14:34:31 +02:00

bat_iv_ogm.h

batman-adv: update copyright years for 2017

2017-01-26 08:34:19 +01:00

bat_v_elp.c

batman-adv: Accept only filled wifi station info

2017-06-13 12:25:43 +02: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: update copyright years for 2017

2017-01-26 08:34:19 +01:00

bat_v_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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-06-15 11:59:32 -04:00

distributed-arp-table.h

batman-adv: update copyright years for 2017

2017-01-26 08:34:19 +01:00

fragmentation.c

Here are two batman-adv bugfixes:

2017-03-16 12:05:38 -07: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

batman-adv: update copyright years for 2017

2017-01-26 08:34:19 +01:00

icmp_socket.h

batman-adv: update copyright years for 2017

2017-01-26 08:34:19 +01:00

Kconfig

batman-adv: Allow selecting BATMAN V if CFG80211 is not built

2016-10-17 16:28:48 +02: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: decrease maximum fragment size

2017-05-23 12:09:13 +02:00

Makefile

batman-adv: update copyright years for 2017

2017-01-26 08:34:19 +01: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

2017-01-26 08:34:19 +01:00

originator.c

2017-01-26 08:34:19 +01:00

originator.h

2017-01-26 08:34:19 +01:00

packet.h

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

2017-01-26 08:34:19 +01:00

send.c

batman-adv: Print correct function names in dbg messages

2017-05-23 14:34:31 +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

2017-01-26 08:34:19 +01:00

sysfs.c

2017-01-26 08:34:19 +01:00

sysfs.h

2017-01-26 08:34:19 +01:00

tp_meter.c

batman-adv: tp_meter: mark init function with __init

2017-06-09 15:56:59 +02:00

tp_meter.h

2017-01-26 08:34:19 +01:00

translation-table.c

batman-adv: simplify return handling in some TT functions

2017-06-09 15:57:00 +02:00

translation-table.h

2017-01-26 08:34:19 +01:00

tvlv.c

2017-01-26 08:34:19 +01:00

tvlv.h

2017-01-26 08:34:19 +01:00

types.h

This feature/cleanup patchset includes the following patches:

2017-04-06 14:37:50 -07:00