David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

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

2015-07-31 23:52:20 -07:00

..

datagram.c

net: Fix skb csum races when peeking

2015-07-15 15:59:58 -07:00

dev_addr_lists.c

net: fix spelling for synchronized

2014-11-18 15:26:32 -05:00

dev_ioctl.c

dev_ioctl: use sizeof(x) instead of sizeof x

2014-11-18 15:27:32 -05:00

dev.c

dev: Spelling fix in comments

2015-07-27 00:54:57 -07:00

drop_monitor.c

…

dst.c

bpf: add helpers to access tunnel metadata

2015-07-31 15:20:22 -07:00

ethtool.c

net/ethtool: Add current supported tunable options

2015-06-11 00:36:37 -07:00

fib_rules.c

fib: Add fib rule match on tunnel id

2015-07-21 10:39:06 -07:00

filter.c

bpf: add helpers to access tunnel metadata

2015-07-31 15:20:22 -07:00

flow_dissector.c

net: Add functions to get skb->hash based on flow structures

2015-07-31 17:07:11 -07:00

flow.c

flowcache: Fix kernel panic in flow_cache_flush_task

2015-02-05 14:38:53 -08:00

gen_estimator.c

net_sched: gen_estimator: extend pps limit

2015-07-08 13:59:20 -07:00

gen_stats.c

gen_stats.c: Duplicate xstats buffer for later use

2015-02-19 15:45:53 -05:00

link_watch.c

dev: introduce dev_get_iflink()

2015-04-02 14:04:59 -04:00

lwtunnel.c

lwtunnel: Make lwtun_encaps[] static

2015-07-29 22:59:39 -07:00

Makefile

lwtunnel: infrastructure for handling light weight tunnels like mpls

2015-07-21 10:39:03 -07:00

neighbour.c

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

2015-06-24 02:58:51 -07:00

net_namespace.c

netns: make nsid_lock per net

2015-05-17 23:41:11 -04:00

net-procfs.c

…

net-sysfs.c

net core: Add protodown support.

2015-07-15 21:39:40 -07:00

net-sysfs.h

…

net-traces.c

…

netclassid_cgroup.c

cgroup: net_cls: fix false-positive "suspicious RCU usage"

2015-07-25 00:13:18 -07:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

2015-05-31 00:03:21 -07:00

netpoll.c

net: rename vlan_tx_* helpers since "tx" is misleading there

2015-01-13 17:51:08 -05:00

netprio_cgroup.c

…

pktgen.c

net: pktgen: Remove unused 'allocated_skbs' field

2015-07-29 23:00:39 -07:00

ptp_classifier.c

…

request_sock.c

net: convert syn_wait_lock to a spinlock

2015-03-23 16:52:26 -04:00

rtnetlink.c

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

2015-07-23 00:41:16 -07:00

scm.c

net: introduce helper macro for_each_cmsghdr

2014-12-10 22:41:55 -05:00

secure_seq.c

net: remove a sparse error in secure_dccpv6_sequence_number()

2015-05-25 22:55:37 -04:00

skbuff.c

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

2015-06-13 23:56:52 -07:00

sock_diag.c

sock_diag: define destruction multicast groups

2015-06-15 19:49:22 -07:00

sock.c

net: sk_clone_lock() should only do get_net() if the parent is not a kernel socket

2015-07-30 15:59:12 -07:00

stream.c

tcp: set SOCK_NOSPACE under memory pressure

2015-05-09 17:38:36 -04:00

sysctl_net_core.c

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

2015-03-20 18:51:09 -04:00

timestamping.c

net: skb_defer_rx_timestamp should check for phydev before setting up classify

2015-07-09 14:17:15 -07:00

tso.c

net: tso: fix unaligned access to crafted TCP header in helper API

2014-10-22 12:52:55 -04:00

utils.c

net: fix inet_proto_csum_replace4() sparse errors

2015-05-25 22:56:47 -04:00