David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

datagram.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08: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

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

2017-01-28 10:33:06 -05:00

devlink.c

devlink: Add E-Switch inline mode control

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

drop_monitor.c

drop_monitor: consider inserted data in genlmsg_end

2017-01-03 11:09:44 -05: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

net: ethtool: Initialize buffer when querying device channel settings

2017-01-18 14:58:23 -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

bpf: allow option for setting bpf_l4_csum_replace from scratch

2017-01-24 14:46:06 -05:00

flow_dissector.c

flow dissector: check if arp_eth is null rather than arp

2017-01-16 13:48:48 -05:00

flow.c

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2016-12-12 19:25:04 -08:00

gen_estimator.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

gen_stats.c

net_sched: gen_estimator: complete rewrite of rate estimators

2016-12-05 15:21:59 -05: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

lwt_bpf.c

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

2017-01-28 10:33:06 -05:00

lwtunnel.c

lwtunnel: Fix oops on state free after encap module unload

2017-01-24 16:21:36 -05:00

Makefile

bpf: BPF for lightweight tunnel infrastructure

2016-12-02 10:51:49 -05:00

neighbour.c

neigh: Send netevent after marking neigh as dead

2016-12-23 12:31:18 -05:00

net_namespace.c

Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit

2016-12-14 14:06:40 -08: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

net-tc: convert tc_verd to integer bitfields

2017-01-08 20:58:52 -05:00

ptp_classifier.c

ptp: Change ptp_class to a proper bitmask

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

request_sock.c

ipv4: Namespaceify tcp_max_syn_backlog knob

2016-12-29 11:38:31 -05:00

rtnetlink.c

device: Implement a bus agnostic dev_num_vf routine

2017-01-20 11:43:17 -05:00

scm.c

scm: remove use CMSG{_COMPAT}_ALIGN(sizeof(struct {compat_}cmsghdr))

2017-01-04 13:04:37 -05:00

secure_seq.c

secure_seq: fix sparse errors

2017-01-12 15:57:10 -05:00

skbuff.c

net: adjust skb->truesize in pskb_expand_head()

2017-01-27 12:03:29 -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

net: fix AF_SMC related typo

2017-01-12 09:47:01 -05:00

stream.c

net: fix sleeping for sk_wait_event()

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

sysctl_net_core.c

net: dev_weight: TX/RX orthogonality

2016-12-29 15:38:35 -05: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

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00