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

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

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

2018-03-06 01:20:46 -05:00

..

bat_algo.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_algo.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_iv_ogm.c

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

2018-03-06 01:20:46 -05:00

bat_iv_ogm.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_v_elp.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_v_elp.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_v_ogm.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_v_ogm.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bat_v.c

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

2018-03-06 01:20:46 -05:00

bat_v.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bitarray.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bitarray.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

bridge_loop_avoidance.c

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

2018-03-06 01:20:46 -05:00

bridge_loop_avoidance.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

debugfs.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

debugfs.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

distributed-arp-table.c

batman-adv: Avoid relation operator comparison with bool

2018-02-27 13:02:36 +01:00

distributed-arp-table.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

fragmentation.c

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

2018-03-06 01:20:46 -05:00

fragmentation.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

gateway_client.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

gateway_client.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

gateway_common.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

gateway_common.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

hard-interface.c

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

2018-03-06 01:20:46 -05:00

hard-interface.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

hash.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

hash.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

icmp_socket.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

icmp_socket.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

Kconfig

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

log.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

log.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

main.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

main.h

batman-adv: Fix indentation of batadv_seq_before

2018-02-27 12:55:36 +01:00

Makefile

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

multicast.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

multicast.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

netlink.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

netlink.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

network-coding.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

network-coding.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

originator.c

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

2018-03-06 01:20:46 -05:00

originator.h

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

2018-03-06 01:20:46 -05:00

routing.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

routing.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

send.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

send.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

soft-interface.c

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

2018-03-06 01:20:46 -05:00

soft-interface.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

sysfs.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

sysfs.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

tp_meter.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

tp_meter.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

translation-table.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

translation-table.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

tvlv.c

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

tvlv.h

batman-adv: Update copyright years for 2018

2018-02-26 17:57:39 +01:00

types.h

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

2018-03-06 01:20:46 -05:00