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

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

The bnx2x gso_type setting bug fix in 'net' conflicted with
changes in 'net-next' that broke the gso_* setting logic
out into a seperate function, which also fixes the bug in
question.  Thus, use the 'net-next' version.

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

2013-02-12 18:58:28 -05:00

..

9p

virtio: 9p: correctly pass physical address to userspace for high pages

2012-10-22 18:19:36 +10:30

802

mrp: make mrp_rcv static

2013-02-11 14:16:26 -05:00

8021q

netpoll: Fix __netpoll_rcu_free so that it can hold the rtnl lock

2013-02-11 19:19:33 -05:00

appletalk

userns: Print out socket uids in a user namespace aware fashion.

2012-08-14 21:48:06 -07:00

atm

atm: use scnprintf() instead of sprintf()

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

ax25

userns: Convert net/ax25 to use kuid_t where appropriate

2012-08-14 21:49:42 -07:00

batman-adv

Included changes:

2013-01-29 15:59:45 -05:00

bluetooth

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

2013-02-08 18:02:14 -05:00

bridge

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

2013-02-12 18:58:28 -05:00

caif

caif_usb: Make the driver name check more efficient

2012-12-09 00:34:02 -05:00

can

can: rework skb reserved data handling

2013-01-28 18:17:25 -05:00

ceph

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

2013-01-02 17:32:49 -08:00

core

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

2013-02-12 18:58:28 -05:00

dcb

net: Allow DCBnl to use other namespaces besides init_net

2012-12-10 14:09:01 -05:00

dccp

inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock

2012-12-14 13:14:07 -05:00

decnet

net neighbour, decnet: Ensure to align device private data on preferred alignment.

2013-02-11 00:21:44 -05:00

dns_resolver

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2012-12-16 15:40:50 -08:00

dsa

dsa: make dsa_switch_setup check for valid port names

2013-01-21 15:40:12 -05:00

ethernet

net: split eth_mac_addr for better error handling

2013-01-21 14:07:44 -05:00

ieee802154

6lowpan: use stack buffer instead of heap

2013-02-06 15:56:17 -05:00

ipv4

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

2013-02-12 18:58:28 -05:00

ipv6

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

2013-02-12 18:58:28 -05:00

ipx

userns: Print out socket uids in a user namespace aware fashion.

2012-08-14 21:48:06 -07:00

irda

net: remove redundant check for timer pending state before del_timer

2013-02-04 13:26:49 -05:00

iucv

s390/irq: remove split irq fields from /proc/stat

2013-01-08 10:57:07 +01:00

key

xfrm: Convert xfrm_addr_cmp() to boolean xfrm_addr_equal().

2013-01-29 22:58:40 -05:00

l2tp

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

2013-02-08 18:02:14 -05:00

lapb

lapb: Neaten debugging

2012-05-17 18:45:20 -04:00

llc

net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm

2012-11-18 20:32:45 -05:00

mac80211

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

2013-02-12 18:58:28 -05:00

mac802154

wpan: use stack buffer instead of heap

2013-02-06 15:56:17 -05:00

netfilter

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

2013-02-12 18:58:28 -05:00

netlabel

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

2012-10-02 13:38:27 -07:00

netlink

netlink: Use FIELD_SIZEOF() in netlink_proto_init().

2013-01-09 23:38:23 -08:00

netrom

net: change return values from -EACCES to -EPERM

2012-09-21 13:58:08 -04:00

nfc

NFC: Use skb_copy_datagram_iovec

2013-01-11 14:56:32 +01:00

openvswitch

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

2013-02-08 18:02:14 -05:00

packet

packet: fix leakage of tx_ring memory

2013-02-03 16:15:23 -05:00

phonet

net: Push capable(CAP_NET_ADMIN) into the rtnl methods

2012-11-18 20:32:44 -05:00

rds

IB/rds: suppress incompatible protocol when version is known

2012-12-26 15:17:37 -08:00

rfkill

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

rose

net: Convert all sysctl registrations to register_net_sysctl

2012-04-20 21:22:30 -04:00

rxrpc

rxrpc: Use FIELD_SIZEOF() in af_rxrpc_init().

2013-01-09 23:38:24 -08:00

sched

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

2013-02-12 18:58:28 -05:00

sctp

net: sctp: remove unused multiple cookie keys

2013-02-12 16:05:11 -05:00

sunrpc

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

2013-02-09 07:55:24 +11:00

tipc

tipc: refactor accept() code for improved readability

2012-12-07 17:23:24 -05:00

unix

unix: Use FIELD_SIZEOF() in af_unix_init().

2013-01-09 23:38:24 -08:00

vmw_vsock

VSOCK: Introduce VM Sockets

2013-02-10 19:41:08 -05:00

wimax

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

wireless

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2013-02-08 13:16:17 -05:00

x25

net: Fix (nearly-)kernel-doc comments for various functions

2012-07-10 23:13:45 -07:00

xfrm

xfrm: Convert xfrm_addr_cmp() to boolean xfrm_addr_equal().

2013-01-29 22:58:40 -05:00

compat.c

make get_file() return its argument

2012-09-26 21:10:25 -04:00

Kconfig

VSOCK: Introduce VM Sockets

2013-02-10 19:41:08 -05:00

Makefile

VSOCK: Introduce VM Sockets

2013-02-10 19:41:08 -05:00

nonet.c

…

socket.c

ethtool: fix sparse warning

2013-02-11 14:16:26 -05:00

sysctl_net.c

user_ns: get rid of duplicate code in net_ctl_permissions

2012-11-18 20:32:45 -05:00