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

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

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

2017-06-15 11:59:32 -04:00

..

datagram.c

net: factor out a helper to decrement the skb refcount

2017-06-12 10:01:29 -04:00

dev_addr_lists.c

net: fix spelling for synchronized

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

dev_ioctl.c

net: ethernet: update drivers to handle HWTSTAMP_FILTER_NTP_ALL

2017-05-21 13:37:32 -04:00

dev.c

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

2017-06-15 11:59:32 -04:00

devlink.c

devlink: fix potential memort leak

2017-06-05 11:24:28 -04:00

drop_monitor.c

drop_monitor: use setup_timer

2017-03-12 23:47:16 -07:00

dst_cache.c

net: dst_cache_per_cpu_dst_set() can be static

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

dst.c

Fix an intermittent pr_emerg warning about lo becoming free.

2017-06-09 12:27:28 -04:00

ethtool.c

net: Add ESP offload features

2017-04-14 10:05:36 +02:00

fib_rules.c

fib_rules: fix error return code

2017-04-27 16:35:57 -04:00

filter.c

bpf: permits narrower load from bpf program context fields

2017-06-14 14:56:25 -04:00

flow_dissector.c

net/flow_dissector: add support for dissection of misc ip header fields

2017-06-04 18:12:23 -04:00

flow.c

flowcache: more "unsigned int"

2017-04-03 19:04:48 -07: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

gro_cells.c

net: Generic XDP

2017-04-25 13:33:49 -04: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

net: add extack arg to lwtunnel build state

2017-05-30 11:55:32 -04:00

lwtunnel.c

net: add extack arg to lwtunnel build state

2017-05-30 11:55:32 -04:00

Makefile

gro_cells: move to net/core/gro_cells.c

2017-02-08 14:38:18 -05:00

neighbour.c

neigh: Really delete an arp/neigh entry on "ip neigh delete" or "arp -d"

2017-06-04 21:37:18 -04:00

net_namespace.c

netns: fix error code when the nsid is already used

2017-06-10 15:58:50 -04:00

net-procfs.c

net-procfs: Use vsnprintf extension %phN

2017-06-04 19:52:58 -04:00

net-sysfs.c

net: make struct net_device::tx_queue_len unsigned int

2017-05-18 10:19:30 -04:00

net-sysfs.h

…

net-traces.c

net: IPv6 fib lookup tracepoint

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

netclassid_cgroup.c

cgroup, net_cls: iterate the fds of only the tasks which are being migrated

2017-03-22 10:32:46 -07:00

netevent.c

netevent: remove automatic variable in register_netevent_notifier()

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

netpoll.c

netpoll: Check for skb->queue_mapping

2017-04-21 15:45:19 -04:00

netprio_cgroup.c

net: break include loop netdevice.h, dsa.h, devlink.h

2017-03-28 22:46:04 -07: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

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

2017-06-15 11:59:32 -04:00

scm.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/user.h>

2017-03-02 08:42:29 +01:00

secure_seq.c

tcp: Namespaceify sysctl_tcp_timestamps

2017-06-08 10:53:29 -04:00

skbuff.c

net: use skb_unref() in napi_consume_skb()

2017-06-14 15:23:51 -04:00

sock_diag.c

netlink: extended ACK reporting

2017-04-13 13:58:20 -04:00

sock_reuseport.c

soreuseport: use "unsigned int" in __reuseport_alloc()

2017-04-03 19:06:38 -07:00

sock.c

tcp: add TCPMemoryPressuresChrono counter

2017-06-08 11:26:19 -04:00

stream.c

sched/headers: Prepare for new header dependencies before moving code to <linux/sched/signal.h>

2017-03-02 08:42:29 +01:00

sysctl_net_core.c

net: move somaxconn init from sysctl code

2017-05-25 13:12:17 -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

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

2017-05-02 16:40:27 -07:00