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

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

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

2013-12-18 16:42:06 -05:00

..

addr.c

…

addr.h

…

bcast.c

tipc: remove interface state mirroring in bearer

2013-12-09 20:30:29 -05:00

bcast.h

…

bearer.c

tipc: eliminate code duplication in media layer

2013-12-11 00:17:43 -05:00

bearer.h

tipc: eliminate code duplication in media layer

2013-12-11 00:17:43 -05:00

config.c

…

config.h

…

core.c

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

2013-12-18 16:42:06 -05:00

core.h

tipc: Use <linux/uaccess.h> instead of <asm/uaccess.h>

2013-12-16 12:48:35 -05:00

discover.c

tipc: remove interface state mirroring in bearer

2013-12-09 20:30:29 -05:00

discover.h

…

eth_media.c

tipc: eliminate code duplication in media layer

2013-12-11 00:17:43 -05:00

handler.c

tipc: protect handler_enabled variable with qitem_lock spin lock

2013-12-10 22:35:49 -05:00

ib_media.c

tipc: eliminate code duplication in media layer

2013-12-11 00:17:43 -05:00

Kconfig

…

link.c

tipc: remove unused 'blocked' flag from tipc_link struct

2013-12-11 00:17:43 -05:00

link.h

tipc: remove unused 'blocked' flag from tipc_link struct

2013-12-11 00:17:43 -05:00

log.c

…

Makefile

…

msg.c

tipc: remove iovec length parameter from all sending functions

2013-10-18 13:20:42 -04:00

msg.h

tipc: message reassembly using fragment chain

2013-11-07 18:30:11 -05:00

name_distr.c

…

name_distr.h

…

name_table.c

tipc: remove unnecessary variables and conditions

2013-12-16 12:48:35 -05:00

name_table.h

…

net.c

…

net.h

…

netlink.c

genetlink: only pass array to genl_register_family_with_ops()

2013-11-19 16:39:05 -05:00

node_subscr.c

…

node_subscr.h

…

node.c

tipc: eliminate redundant code with kfree_skb_list routine

2013-12-11 00:17:42 -05:00

node.h

tipc: message reassembly using fragment chain

2013-11-07 18:30:11 -05:00

port.c

tipc: remove unnecessary variables and conditions

2013-12-16 12:48:35 -05:00

port.h

tipc: remove iovec length parameter from all sending functions

2013-10-18 13:20:42 -04:00

ref.c

…

ref.h

…

server.c

…

server.h

…

socket.c

tipc: change lock_sock order in connect()

2013-12-16 12:48:35 -05:00

subscr.c

…

subscr.h

…

sysctl.c

…