David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

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

2013-10-08 23:07:53 -04:00

..

datagram.c

net: use skb_copy_datagram_from_iovec() in zerocopy_sg_from_iovec()

2013-08-07 16:52:38 -07:00

dev_addr_lists.c

net/core: dev_mc_sync_multiple calls wrong helper

2013-05-31 16:56:56 -07:00

dev_ioctl.c

net: fix kernel deadlock with interface rename and netdev name retrieval.

2013-06-26 13:42:54 -07:00

dev.c

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

2013-10-08 23:07:53 -04:00

drop_monitor.c

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

dst.c

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

ethtool.c

ethtool: fixed trailing statements in ethtool

2013-07-16 12:14:51 -07:00

fib_rules.c

fib_rules: fix suppressor names and default values

2013-08-03 10:40:23 -07:00

filter.c

net: fix unsafe set_memory_rw from softirq

2013-10-07 15:16:45 -04:00

flow_dissector.c

flow_dissector: factor out the ports extraction in skb_flow_get_ports

2013-10-03 15:36:37 -04:00

flow.c

net: delete __cpuinit usage from all net files

2013-07-14 19:36:58 -04:00

gen_estimator.c

net_sched: add 64bit rate estimators

2013-06-11 02:51:03 -07:00

gen_stats.c

net_sched: add 64bit rate estimators

2013-06-11 02:51:03 -07:00

iovec.c

net: move iov_pages() to net/core/iovec.c

2013-08-07 16:52:33 -07:00

link_watch.c

net: make all team port device link events urgent

2013-06-13 02:31:41 -07:00

Makefile

net: move procfs code to net/core/net-procfs.c

2013-02-19 00:51:10 -05:00

neighbour.c

net: neighbour: use source address of last enqueued packet for solicitation

2013-09-26 13:46:10 -04:00

net_namespace.c

userns: Kill nsown_capable it makes the wrong thing easy

2013-08-30 23:44:11 -07:00

net-procfs.c

rps: selective flow shedding during softnet overflow

2013-05-20 13:48:04 -07:00

net-sysfs.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2013-09-07 14:35:32 -07:00

net-sysfs.h

xps: Add CONFIG_XPS

2010-11-28 18:24:14 -08:00

net-traces.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

netevent.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

netpoll.c

netpoll: fix NULL pointer dereference in netpoll_cleanup

2013-09-19 14:15:53 -04:00

netprio_cgroup.c

cgroup: netprio: remove unnecessary task_netprioidx

2013-10-08 16:27:34 -04:00

pktgen.c

pktgen: add needed include file

2013-07-29 00:47:14 -07:00

request_sock.c

tcp: fix a panic on UP machines in reqsk_fastopen_remove

2013-01-14 18:10:05 -05:00

rtnetlink.c

dev: update __dev_notify_flags() to send rtnl msg

2013-09-30 15:08:12 -04:00

scm.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2013-09-07 14:35:32 -07:00

secure_seq.c

net: net_secret should not depend on TCP

2013-09-28 15:19:40 -07:00

skbuff.c

skb: allow skb_scrub_packet() to be used by tunnels

2013-09-04 00:27:25 -04:00

sock_diag.c

sock_diag: fix filter code sent to userspace

2013-06-10 22:23:32 -07:00

sock.c

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

2013-10-08 23:07:53 -04:00

stream.c

net: add sk_stream_is_writeable() helper

2013-07-24 17:54:48 -07:00

sysctl_net_core.c

qdisc: allow setting default queuing discipline

2013-08-31 00:32:32 -04:00

timestamping.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

user_dma.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

utils.c

net: core: move mac_pton() to lib/net_utils.c

2013-06-05 12:00:27 -07:00