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

..

datagram.c

net: Fix save software checksum complete

2014-06-15 01:00:49 -07:00

dev_addr_lists.c

net: Add support for device specific address syncing

2014-06-02 10:40:54 -07:00

dev_ioctl.c

net_tstamp: Add SIOCGHWTSTAMP ioctl to match SIOCSHWTSTAMP

2013-11-19 19:07:21 +00:00

dev.c

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

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

drop_monitor.c

drop_monitor: remove unnecessary break after return

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

dst.c

ipv4: fix dst race in sk_dst_get()

2014-06-25 17:41:44 -07:00

ethtool.c

ethtool: Check that reserved fields of struct ethtool_rxfh are 0

2014-06-03 02:43:16 +01:00

fib_rules.c

net: fix 'ip rule' iif/oif device rename

2014-02-09 19:02:52 -08:00

filter.c

net: filter: sk_chk_filter() no longer mangles filter

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

flow_dissector.c

net: Only do flow_dissector hash computation once per packet

2014-07-07 21:14:21 -07:00

flow.c

CPU hotplug notifiers registration fixes for 3.15-rc1

2014-04-07 14:55:46 -07: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

iovec: move memcpy_from/toiovecend to lib/iovec.c

2014-06-27 11:47:58 -07:00

link_watch.c

arch: Mass conversion of smp_mb__*()

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

Makefile

net: Add a software TSO helper API

2014-05-22 14:57:15 -04:00

neighbour.c

neigh: sysctl - simplify address calculation of gc_* variables

2014-07-14 14:32:51 -07:00

net_namespace.c

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

2014-05-24 00:32:30 -04:00

net-procfs.c

rps: selective flow shedding during softnet overflow

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

net-sysfs.c

net: add name_assign_type netdev attribute

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

net-sysfs.h

net: netdev_kobject_init: annotate with __init

2014-01-05 20:27:54 -05:00

net-traces.c

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

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

netclassid_cgroup.c

cgroup: remove css_parent()

2014-05-16 13:22:48 -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 use after free

2014-07-08 20:50:53 -07:00

netprio_cgroup.c

cgroup: remove css_parent()

2014-05-16 13:22:48 -04:00

pktgen.c

pktgen: remove unnecessary break after goto

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

ptp_classifier.c

ptp: Classify ptp over ip over vlan packets

2014-07-07 16:57:18 -07:00

request_sock.c

inet: reduce TLB pressure for listeners

2014-06-25 16:37:24 -07:00

rtnetlink.c

rtnetlink: Drop unnecessary return value from ndo_dflt_fdb_del

2014-07-16 23:13:26 -07: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

inetpeer: get rid of ip_id_count

2014-06-02 11:00:41 -07:00

skbuff.c

net: fix setting csum_start in skb_segment()

2014-06-25 20:45:54 -07:00

sock_diag.c

net: Move the permission check in sock_diag_put_filterinfo to packet_diag_dump

2014-04-24 13:44:53 -04:00

sock.c

net: Split sk_no_check into sk_no_check_{rx,tx}

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

stream.c

net: replace macros net_random and net_srandom with direct calls to prandom

2014-01-14 15:15:25 -08:00

sysctl_net_core.c

rps: NUMA flow limit allocations

2013-12-19 19:00:07 -05:00

timestamping.c

net: Simplify ptp class checks

2014-07-07 16:57:09 -07:00

tso.c

net: tso: Export symbols for modular build

2014-05-30 15:52:03 -07: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: avoid dependency of net_get_random_once on nop patching

2014-05-14 00:37:34 -04:00