David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

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

2016-11-26 23:42:21 -05:00

..

datagram.c

udp: do fwd memory scheduling on dequeue

2016-11-07 13:24:41 -05: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

net: properly flush delay-freed skbs

2016-11-25 19:37:49 -05:00

devlink.c

devlink: Add E-Switch inline mode control

2016-11-24 16:01:14 -05:00

drop_monitor.c

genetlink: mark families as __ro_after_init

2016-10-27 16:16:09 -04:00

dst_cache.c

net: dst_cache_per_cpu_dst_set() can be static

2016-03-18 17:45:08 -04:00

dst.c

net: add dst_cache to ovs vxlan lwtunnel

2016-02-16 20:21:48 -05:00

ethtool.c

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

2016-11-26 23:42:21 -05:00

fib_rules.c

net: core: add missing check for uid_range in rule_exists.

2016-11-09 13:28:10 -05:00

filter.c

net: filter: run cgroup eBPF ingress programs

2016-11-25 16:26:04 -05:00

flow_dissector.c

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

2016-11-26 23:42:21 -05:00

flow.c

flowcache: Avoid OOM condition under preasure

2016-03-17 10:28:42 +01:00

gen_estimator.c

net: sched: do not acquire qdisc spinlock in qdisc/class stats dump

2016-06-07 16:37:14 -07:00

gen_stats.c

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

2016-06-10 11:52:24 -07:00

hwbm.c

net: hwbm: Fix unbalanced spinlock in error case

2016-05-25 12:35:09 -07:00

link_watch.c

dev: introduce dev_get_iflink()

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

lwtunnel.c

ipv6: sr: add support for SRH encapsulation and injection with lwtunnels

2016-11-09 20:40:06 -05:00

Makefile

net: add a hardware buffer management helper API

2016-03-14 12:19:46 -04:00

neighbour.c

neigh: allow admin to set NUD_STALE

2016-08-08 15:36:38 -07:00

net_namespace.c

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

2016-11-22 13:27:16 -05:00

net-procfs.c

net: remove NETDEV_TX_LOCKED support

2016-04-26 15:53:05 -04:00

net-sysfs.c

net: Add support for XPS with QoS via traffic classes

2016-10-31 15:00:48 -04:00

net-sysfs.h

net: netdev_kobject_init: annotate with __init

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

net-traces.c

net: IPv6 fib lookup tracepoint

2015-11-22 11:54:10 -05:00

netclassid_cgroup.c

core: remove unneded headers for net cgroup controllers.

2016-02-17 15:31:27 -05:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

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

netpoll.c

netpoll: more efficient locking

2016-11-16 18:32:02 -05:00

netprio_cgroup.c

core: remove unneded headers for net cgroup controllers.

2016-02-17 15:31:27 -05:00

pktgen.c

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00

ptp_classifier.c

ptp: Change ptp_class to a proper bitmask

2015-11-03 11:08:22 -05:00

request_sock.c

tcp: restore fastopen operations

2015-10-05 03:19:06 -07:00

rtnetlink.c

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

2016-11-26 23:42:21 -05:00

scm.c

unix: correctly track in-flight fds in sending process user_struct

2016-02-08 10:30:42 -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

tcp: enhance tcp_collapse_retrans() with skb_shift()

2016-11-24 15:40:42 -05:00

sock_diag.c

sock_diag: align nlattr properly when needed

2016-04-26 12:00:48 -04:00

sock_reuseport.c

soreuseport: do not export reuseport_add_sock()

2016-10-18 14:18:23 -04:00

sock.c

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

2016-11-15 10:54:36 -05:00

stream.c

net: fix sleeping for sk_wait_event()

2016-11-14 13:17:21 -05:00

sysctl_net_core.c

bpf: add generic constant blinding for use in jits

2016-05-16 13:49:32 -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: add support for IPv6

2015-10-26 22:24:22 -07:00

utils.c

net: the space is required before the open parenthesis '('

2016-06-29 05:15:14 -04:00