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

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmgenet.c
	net/core/sock.c

Conflicts were overlapping changes in bcmgenet and the
lockdep handling of sockets.

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

2017-03-15 11:59:10 -07:00

..

addr.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

addr.h

atm: use const where reasonable

2008-06-17 16:20:06 -07:00

atm_misc.c

atm: eliminate atm_guess_pdu2truesize()

2011-11-26 16:40:30 -05:00

atm_sysfs.c

atm: use scnprintf() instead of sprintf()

2012-12-17 20:50:51 -08:00

br2684.c

net: remove MTU limits on a few ether_setup callers

2016-10-21 13:57:50 -04:00

clip.c

net: add dev arg to ndo_neigh_construct/destroy

2016-07-05 09:06:28 -07:00

common.c

atm: remove an unnecessary loop

2017-03-13 15:37:29 -07:00

common.h

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

ioctl.c

net: Convert net_ratelimit uses to net_<level>_ratelimited

2012-05-15 13:45:03 -04:00

Kconfig

…

lec_arpc.h

…

lec.c

net: atm: Fix warnings in net/atm/lec.c when !CONFIG_PROC_FS

2016-12-28 15:11:32 -05:00

lec.h

net: add ETH_P_802_3_MIN

2013-03-28 01:20:42 -04:00

Makefile

…

mpc.c

lib/vsprintf.c: remove %Z support

2017-02-27 18:43:47 -08:00

mpc.h

net: atm: constify in_cache_ops and eg_cache_ops structures

2015-11-23 15:49:29 -05:00

mpoa_caches.c

ATM: use designated initializers

2016-12-17 11:56:57 -05:00

mpoa_caches.h

…

mpoa_proc.c

treewide: Fix typo in printk messages

2015-03-06 23:04:40 +01:00

pppoatm.c

arch: Mass conversion of smp_mb__*()

2014-04-18 14:20:48 +02:00

proc.c

procfs: new helper - PDE_DATA(inode)

2013-04-09 14:13:32 -04:00

protocols.h

…

pvc.c

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

raw.c

net: Fix use after free by removing length arg from sk_data_ready callbacks.

2014-04-11 16:15:36 -04:00

resources.c

net:atm:fix up ENOIOCTLCMD error handling

2012-08-31 16:14:33 -04:00

resources.h

atm: correct sysfs 'device' link creation and parent relationships

2010-12-10 15:45:05 -08:00

signaling.c

net/atm: sk_err_soft must be positive

2016-05-23 13:51:10 -07:00

signaling.h

…

svc.c

net: Work around lockdep limitation in sockets that use sockets

2017-03-09 18:23:27 -08:00