David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

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

2017-08-09 16:28:45 -07:00

..

datagram.c

sock: add MSG_ZEROCOPY

2017-08-03 21:37:29 -07:00

dev_addr_lists.c

net: fix spelling for synchronized

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

dev_ioctl.c

net: check dev->addr_len for dev_set_mac_address()

2017-07-29 11:25:05 -07:00

dev.c

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

2017-08-09 16:28:45 -07: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

net: store port/representator id in metadata_dst

2017-06-25 11:42:01 -04:00

ethtool.c

net: ethtool: add support for forward error correction modes

2017-07-29 23:23:44 -07:00

fib_notifier.c

net: core: Make the FIB notification chain generic

2017-08-03 15:35:59 -07:00

fib_rules.c

net: fib_rules: Implement notification logic in core

2017-08-03 15:35:59 -07:00

filter.c

bpf: fix the printing of ifindex

2017-08-03 09:25:26 -07:00

flow_dissector.c

flow_dissector: remove unused functions

2017-08-02 10:50:03 -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

ipv6: sr: define core operations for seg6local lightweight tunnel

2017-08-07 14:16:22 -07:00

Makefile

net: core: Make the FIB notification chain generic

2017-08-03 15:35:59 -07:00

neighbour.c

Add wait_for_random_bytes() and get_random_*_wait() functions so that

2017-07-15 12:44:02 -07:00

net_namespace.c

net: convert net.passive from atomic_t to refcount_t

2017-07-01 07:39:09 -07:00

net-procfs.c

net-procfs: Use vsnprintf extension %phN

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

net-sysfs.c

net: convert net.passive from atomic_t to refcount_t

2017-07-01 07:39:09 -07: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: Fix device name check in netpoll_setup()

2017-07-26 17:01:43 -07: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: convert sk_buff.users from atomic_t to refcount_t

2017-07-01 07:39:07 -07: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

rtnetlink: allocate more memory for dev_set_mac_address()

2017-07-20 15:23:22 -07: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

sock: ulimit on MSG_ZEROCOPY pages

2017-08-03 21:37:30 -07: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

sock: add SOCK_ZEROCOPY sockopt

2017-08-03 21:37:29 -07: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