David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

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

2018-10-19 11:03:06 -07:00

..

datagram.c

net: simplify sock_poll_wait

2018-07-30 09:10:25 -07:00

dev_addr_lists.c

net: change the comment of dev_mc_init

2018-04-19 12:58:20 -04:00

dev_ioctl.c

net: remove redundant input checks in SIOCSIFTXQLEN case of dev_ifsioc

2018-07-24 11:36:15 -07:00

dev.c

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

2018-10-15 23:21:07 -07:00

devlink.c

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

2018-10-12 21:38:46 -07:00

drop_monitor.c

treewide: setup_timer() -> timer_setup()

2017-11-21 15:57:07 -08:00

dst_cache.c

net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency

2018-03-05 12:52:45 -05:00

dst.c

netfilter: nf_tables: add tunnel support

2018-08-03 21:12:12 +02:00

ethtool.c

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

2018-10-19 11:03:06 -07:00

failover.c

net: Introduce generic failover module

2018-05-28 22:59:54 -04:00

fib_notifier.c

net: Fix fib notifer to return errno

2018-03-29 14:10:30 -04:00

fib_rules.c

net/fib_rules: Update fib_nl_dumprule for strict data checking

2018-10-08 10:39:05 -07:00

filter.c

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

2018-10-15 23:21:07 -07:00

flow_dissector.c

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

2018-09-25 20:29:38 -07:00

gen_estimator.c

net: core: protect rate estimator statistics pointer with lock

2018-08-11 12:37:10 -07:00

gen_stats.c

net/core: make function ___gnet_stats_copy_basic() static

2018-09-28 10:25:11 -07:00

gro_cells.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

hwbm.c

…

link_watch.c

net: linkwatch: add check for netdevice being present to linkwatch_do_dev

2018-09-19 21:06:46 -07:00

lwt_bpf.c

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

2018-08-07 11:02:05 -07:00

lwtunnel.c

ipv6: sr: define core operations for seg6local lightweight tunnel

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

Makefile

bpf, sockmap: convert to generic sk_msg interface

2018-10-15 12:23:19 -07:00

neighbour.c

net: Evict neighbor entries on carrier down

2018-10-12 09:47:39 -07:00

net_namespace.c

net/namespace: Update rtnl_net_dumpid for strict data checking

2018-10-08 10:39:05 -07:00

net-procfs.c

proc: introduce proc_create_net{,_data}

2018-05-16 07:24:30 +02:00

net-sysfs.c

net: allow to call netif_reset_xps_queues() under cpus_read_lock

2018-08-09 14:25:06 -07:00

net-sysfs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

net-traces.c

net/ipv6: Udate fib6_table_lookup tracepoint

2018-05-24 23:01:15 -04:00

netclassid_cgroup.c

cgroup: add @flags to css_task_iter_start() and implement CSS_TASK_ITER_PROCS

2017-07-21 11:14:51 -04:00

netevent.c

…

netpoll.c

Revert "bond: take rcu lock in netpoll_send_skb_on_dev"

2018-10-19 10:45:08 -07:00

netprio_cgroup.c

net: remove duplicate includes

2017-12-13 13:18:46 -05:00

page_pool.c

net/page_pool: Fix inconsistent lock state warning

2018-07-19 23:23:01 -07:00

pktgen.c

pktgen: Fix fall-through annotation

2018-09-13 15:36:41 -07:00

ptp_classifier.c

…

request_sock.c

ipv4: Namespaceify tcp_max_syn_backlog knob

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

rtnetlink.c

net: bridge: add support for per-port vlan stats

2018-10-12 10:18:58 -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

infiniband: i40iw, nes: don't use wall time for TCP sequence numbers

2018-07-11 12:10:19 -06:00

skbuff.c

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

2018-10-12 21:38:46 -07:00

skmsg.c

tls: convert to generic sk_msg interface

2018-10-15 12:23:19 -07:00

sock_diag.c

net: sock_diag: Fix spectre v1 gadget in __sock_diag_cmd()

2018-08-14 10:01:24 -07:00

sock_map.c

bpf, sockmap: convert to generic sk_msg interface

2018-10-15 12:23:19 -07:00

sock_reuseport.c

bpf: Enable BPF_PROG_TYPE_SK_REUSEPORT bpf prog in reuseport selection

2018-08-11 01:58:46 +02:00

sock.c

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

2018-10-15 23:21:07 -07:00

stream.c

vfs: do bulk POLL* -> EPOLL* replacement

2018-02-11 14:34:03 -08:00

sysctl_net_core.c

headers: untangle kmemleak.h from mm.h

2018-04-05 21:36:27 -07:00

timestamping.c

…

tso.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

utils.c

net: Remove some unneeded semicolon

2018-08-04 13:05:39 -07:00

xdp.c

xdp: remove redundant variable 'headroom'

2018-09-01 01:35:53 +02:00