mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-19 15:57:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
bdcc02cf1bb508fc700df7662f55058f651f2621
linux/net/batman-adv
T
History
David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-04-01 19:49:34 -04: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04:00
distributed-arp-table.h
batman-adv: add DAT cache netlink support
2018-03-14 10:15:08 +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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-04-01 19:49:34 -04:00
multicast.h
batman-adv: add multicast flags netlink support
2018-03-14 10:15:34 +01:00
netlink.c
batman-adv: add multicast flags netlink support
2018-03-14 10:15:34 +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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04: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