David S. Miller ba3e2084f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/xfrm6_output.c net/openvswitch/flow_netlink.c net/openvswitch/vport-gre.c net/openvswitch/vport-vxlan.c net/openvswitch/vport.c net/openvswitch/vport.h The openvswitch conflicts were overlapping changes. One was the egress tunnel info fix in 'net' and the other was the vport ->send() op simplification in 'net-next'. The xfrm6_output.c conflicts was also a simplification overlapping a bug fix. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-24 06:54:12 -07:00
..
addr.c	tipc: simplify include dependencies	2015-05-14 12:24:45 -04:00
addr.h	tipc: simplify include dependencies	2015-05-14 12:24:45 -04:00
bcast.c	tipc: extend broadcast link window size	2015-10-21 19:02:17 -07:00
bcast.h	tipc: reduce locking scope during packet reception	2015-07-20 20:41:16 -07:00
bearer.c	tipc: send out RESET immediately when link goes down	2015-10-15 23:55:22 -07:00
bearer.h	tipc: make media xmit call outside node spinlock context	2015-07-20 20:41:15 -07:00
core.c	tipc: rename functions defined in subscr.c	2015-05-04 15:04:00 -04:00
core.h	tipc: clean up link creation	2015-07-30 17:25:15 -07:00
discover.c	tipc: move received discovery data evaluation inside node.c	2015-07-30 17:25:14 -07:00
discover.h	tipc: involve namespace infrastructure	2015-01-12 16:24:32 -05:00
eth_media.c	tipc: make media address offset a common define	2015-02-27 18:18:48 -05:00
ib_media.c	tipc: rename media/msg related definitions	2015-02-27 18:18:48 -05:00
Kconfig	tipc: add ip/udp media type	2015-03-05 22:08:42 -05:00
link.c	tipc: update node FSM when peer RESET message is received	2015-10-15 23:55:23 -07:00
link.h	tipc: update node FSM when peer RESET message is received	2015-10-15 23:55:23 -07:00
Makefile	tipc: add ip/udp media type	2015-03-05 22:08:42 -05:00
msg.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
msg.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
name_distr.c	tipc: make media xmit call outside node spinlock context	2015-07-20 20:41:15 -07:00
name_distr.h	tipc: resolve race problem at unicast message reception	2015-02-05 16:00:02 -08:00
name_table.c	tipc: rename functions defined in subscr.c	2015-05-04 15:04:00 -04:00
name_table.h	tipc: convert legacy nl name table dump to nl compat	2015-02-09 13:20:48 -08:00
net.c	tipc: simplify include dependencies	2015-05-14 12:24:45 -04:00
net.h	tipc: make tipc node table aware of net namespace	2015-01-12 16:24:32 -05:00
netlink_compat.c	tipc: don't sanity check non-existing TLV (NL compat)	2015-08-17 10:39:54 -07:00
netlink.c	tipc: move and rename the legacy nl api to "nl compat"	2015-02-09 13:20:47 -08:00
netlink.h	tipc: move and rename the legacy nl api to "nl compat"	2015-02-09 13:20:47 -08:00
node.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
node.h	tipc: remove implicit message delivery in node_unlock()	2015-07-30 17:25:14 -07:00
server.c	tipc: use sock_create_kern interface to create kernel socket	2015-05-14 13:39:33 -04:00
server.h	tipc: make subscriber server support net namespace	2015-01-12 16:24:33 -05:00
socket.c	tipc: clean up socket layer message reception	2015-07-26 16:31:50 -07:00
socket.h	tipc: clean up socket layer message reception	2015-07-26 16:31:50 -07:00
subscr.c	tipc: adjust locking policy of subscription	2015-05-04 15:04:01 -04:00
subscr.h	tipc: rename functions defined in subscr.c	2015-05-04 15:04:00 -04:00
sysctl.c	tipc: add name distributor resiliency queue	2014-09-01 17:51:48 -07:00
udp_media.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00