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

The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.

In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.

The aquantia driver conflicts were simple overlapping changes.

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

2019-06-27 21:06:39 -07:00

..

addr.c

tipc: handle collisions of 32-bit node address hash values

2018-03-23 13:12:18 -04:00

addr.h

tipc: add 128-bit node identifier

2018-03-23 13:12:18 -04:00

bcast.c

tipc: rename function msg_get_wrapped() to msg_inner_hdr()

2019-06-25 13:42:54 -07:00

bcast.h

tipc: fix a null pointer deref

2019-03-21 09:56:55 -07:00

bearer.c

netlink: make validation more configurable for future strictness

2019-04-27 17:07:21 -04:00

bearer.h

tipc: enable tracepoints in tipc

2018-12-19 11:49:24 -08:00

core.c

tipc: change to use register_pernet_device

2019-06-22 16:51:47 -07:00

core.h

tipc: introduce new capability flag for cluster

2019-03-19 13:56:17 -07:00

diag.c

tipc: switch to rhashtable iterator

2018-08-29 18:04:54 -07:00

discover.c

tipc: fix lockdep warning when reinitilaizing sockets

2018-11-17 22:01:31 -08:00

discover.h

tipc: some cleanups in the file discover.c

2018-03-23 13:12:17 -04:00

eth_media.c

…

group.c

tipc: purge deferredq list for each grp member in tipc_group_delete

2019-06-16 20:42:05 -07:00

group.h

tipc: extend sock diag for group communication

2018-06-30 21:05:42 +09:00

ib_media.c

…

Kconfig

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

link.c

tipc: rename function msg_get_wrapped() to msg_inner_hdr()

2019-06-25 13:42:54 -07:00

link.h

tipc: fix missing Name entries due to half-failover

2019-05-04 00:59:51 -04:00

Makefile

tipc: enable tracepoints in tipc

2018-12-19 11:49:24 -08:00

monitor.c

netlink: make nla_nest_start() add NLA_F_NESTED flag

2019-04-27 17:03:44 -04:00

monitor.h

tipc: dump monitor attributes

2016-07-26 14:26:42 -07:00

msg.c

tipc: buffer overflow handling in listener socket

2018-09-29 11:24:22 -07:00

msg.h

tipc: rename function msg_get_wrapped() to msg_inner_hdr()

2019-06-25 13:42:54 -07:00

name_distr.c

tipc: eliminate message disordering during binding table update

2018-10-22 19:29:12 -07:00

name_distr.h

tipc: permit overlapping service ranges in name table

2018-03-31 22:19:52 -04:00

name_table.c

netlink: make nla_nest_start() add NLA_F_NESTED flag

2019-04-27 17:03:44 -04:00

name_table.h

tipc: eliminate message disordering during binding table update

2018-10-22 19:29:12 -07:00

net.c

netlink: make validation more configurable for future strictness

2019-04-27 17:07:21 -04:00

net.h

tipc: fix lockdep warning when reinitilaizing sockets

2018-11-17 22:01:31 -08:00

netlink_compat.c

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

2019-06-27 21:06:39 -07:00

netlink.c

tipc: fix missing indentation in source code

2019-06-24 07:29:45 -07:00

netlink.h

…

node.c

tipc: rename function msg_get_wrapped() to msg_inner_hdr()

2019-06-25 13:42:54 -07:00

node.h

tipc: improve TIPC throughput by Gap ACK blocks

2019-04-04 18:29:25 -07:00

socket.c

tipc: fix hanging clients using poll with EPOLLOUT flag

2019-05-09 09:26:09 -07:00

socket.h

tipc: add trace_events for tipc socket

2018-12-19 11:49:24 -08:00

subscr.c

tipc: fix unbalanced reference counter

2018-04-12 21:46:10 -04:00

subscr.h

tipc: fix modprobe tipc failed after switch order of device registration

2019-05-20 10:45:43 -07:00

sysctl.c

tipc: set sysctl_tipc_rmem and named_timeout right range

2019-04-16 21:32:02 -07:00

topsrv.c

tipc: fix modprobe tipc failed after switch order of device registration

2019-05-20 10:45:43 -07:00

topsrv.h

tipc: rename tipc_server to tipc_topsrv

2018-02-16 15:26:34 -05:00

trace.c

tipc: remove unneeded semicolon in trace.c

2019-01-17 22:04:43 -08:00

trace.h

tipc: add trace_events for tipc bearer

2018-12-19 11:49:25 -08:00

udp_media.c

tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb

2019-06-18 20:48:45 -04:00

udp_media.h

tipc: implement configuration of UDP media MTU

2018-04-20 11:04:05 -04:00