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

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

2014-07-22 00:44:59 -07:00

..

9p

9P: remove unnecessary break after return

2014-07-15 16:27:00 -07:00

802

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

8021q

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

2014-07-16 14:09:34 -07:00

appletalk

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

2014-07-16 14:09:34 -07:00

atm

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ax25

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

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

batman-adv

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

2014-07-22 00:44:59 -07:00

bluetooth

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

bridge

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2014-07-20 21:01:43 -07:00

caif

caif: remove unnecessary break after goto

2014-07-15 16:27:01 -07:00

can

can: add hash based access to single EFF frame filters

2014-05-19 09:38:24 +02:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2014-06-12 23:06:23 -07:00

core

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

2014-07-22 00:44:59 -07:00

dcb

Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8

2014-07-17 16:02:29 -07:00

dccp

inet: move ipv6only in sock_common

2014-07-01 23:46:21 -07:00

decnet

net: Split sk_no_check into sk_no_check_{rx,tx}

2014-05-23 16:28:53 -04:00

dns_resolver

dns_resolver: Null-terminate the right string

2014-07-20 22:33:32 -07:00

dsa

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ethernet

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

hsr

net/hsr: Remove left-over never-true conditional code.

2014-07-11 15:04:40 -07:00

ieee802154

ieee802154: remove unnecessary break after goto

2014-07-15 16:27:01 -07:00

ipv4

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

2014-07-22 00:44:59 -07:00

ipv6

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

2014-07-22 00:44:59 -07:00

ipx

net: Split sk_no_check into sk_no_check_{rx,tx}

2014-05-23 16:28:53 -04:00

irda

irda: remove unnecessary break after return

2014-07-15 16:27:01 -07:00

iucv

af_iucv: avoid path quiesce of severed path in shutdown()

2014-07-21 20:21:40 -07:00

key

af_key: remove unnecessary break after return

2014-07-15 16:27:00 -07:00

l2tp

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

2014-07-16 14:09:34 -07:00

lapb

net/lapb: re-send packets on timeout

2013-09-23 16:52:45 -04:00

llc

llc: remove noisy WARN from llc_mac_hdr_init

2014-01-28 18:01:32 -08:00

mac80211

mac80211: remove unnecessary break after return

2014-07-15 16:27:00 -07:00

mac802154

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

mpls

gre: Call gso_make_checksum

2014-06-04 22:46:38 -07:00

netfilter

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

2014-07-22 00:44:59 -07:00

netlabel

netlabel: remove unnecessary break after goto

2014-07-15 16:27:00 -07:00

netlink

netlink: remove bool varible

2014-07-16 23:15:00 -07:00

netrom

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

nfc

NFC: remove unnecessary break after goto

2014-07-15 16:27:01 -07:00

openvswitch

openvswitch: make generic netlink group const

2014-07-16 23:41:13 -07:00

packet

packet: remove unnecessary break after return

2014-07-15 16:26:59 -07:00

phonet

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

rds

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

2014-06-12 14:27:40 -07:00

rfkill

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2014-05-22 13:58:36 -04:00

rose

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

rxrpc

net/rxrpc/ar-key.c: drop negativity check on unsigned value

2014-07-20 21:25:56 -07:00

sched

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

2014-07-22 00:44:59 -07:00

sctp

net: sctp: deprecate rfc6458, 5.3.2. SCTP_SNDRCV support

2014-07-16 14:40:04 -07:00

sunrpc

NFSv4: test SECINFO RPC_AUTH_GSS pseudoflavors for support

2014-06-24 18:46:58 -04:00

tipc

tipc: fix sparse non static symbol warnings

2014-07-20 22:19:04 -07:00

unix

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

2014-06-12 14:27:40 -07:00

vmw_vsock

vsock: Make transport the proto owner

2014-05-05 13:13:50 -04:00

wimax

wimax: remove dead code

2013-11-21 13:09:42 -05:00

wireless

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2014-07-10 17:00:24 -04:00

x25

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

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

xfrm

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

2014-06-03 23:32:12 -07:00

compat.c

net/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types

2014-03-06 16:30:45 +01:00

Kconfig

Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

2014-04-03 13:05:42 -07:00

Makefile

net: move 6lowpan compression code to separate module

2014-01-15 15:36:38 -08:00

nonet.c

…

socket.c

net: use SYSCALL_DEFINEx for sys_recv

2014-04-16 15:15:05 -04:00

sysctl_net.c

net: Update the sysctl permissions handler to test effective uid/gid

2013-10-07 15:57:56 -04:00