David S. Miller 71930d6102 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.

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

2020-07-11 00:46:00 -07:00

..

bpf_sk_storage.c

bpf: Set map_btf_{name, id} for all map types

2020-06-22 22:22:58 +02:00

datagram.c

…

datagram.h

…

dev_addr_lists.c

net: explain the lockdep annotations for dev_uc_unsync()

2020-06-28 21:38:27 -07:00

dev_ioctl.c

…

dev.c

net: sched: Pass root lock to Qdisc_ops.enqueue

2020-06-29 17:08:28 -07:00

devlink.c

devlink: Add devlink health port reporters API

2020-07-10 14:32:02 -07:00

drop_monitor.c

net: Add MODULE_DESCRIPTION entries to network modules

2020-06-20 21:33:57 -07:00

dst_cache.c

…

dst.c

net/dst: use a smaller percpu_counter batch for dst entries accounting

2020-05-08 21:33:33 -07:00

failover.c

…

fib_notifier.c

…

fib_rules.c

…

filter.c

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

2020-07-11 00:46:00 -07:00

flow_dissector.c

bpf, netns: Keep attached programs in bpf_prog_array

2020-06-30 10:45:08 -07:00

flow_offload.c

net: flow_offload: fix flow_indr_dev_unregister path

2020-06-19 20:12:58 -07:00

gen_estimator.c

…

gen_stats.c

docs: networking: convert gen_stats.txt to ReST

2020-04-28 14:39:46 -07:00

gro_cells.c

…

hwbm.c

…

link_watch.c

net: Add IF_OPER_TESTING

2020-04-20 12:43:24 -07:00

lwt_bpf.c

…

lwtunnel.c

…

Makefile

…

neighbour.c

net: neighbor: add fdb extended attribute

2020-06-24 14:36:33 -07:00

net_namespace.c

nsproxy: add struct nsset

2020-05-09 13:57:12 +02:00

net-procfs.c

…

net-sysfs.c

net: core: recursively find netdev by device node

2020-05-15 10:18:49 -07:00

net-sysfs.h

…

net-traces.c

…

netclassid_cgroup.c

cgroup, netclassid: remove double cond_resched

2020-04-21 15:44:30 -07:00

netevent.c

…

netpoll.c

netpoll: accept NULL np argument in netpoll_send_skb()

2020-05-07 18:11:07 -07:00

netprio_cgroup.c

netprio_cgroup: Fix unlimited memory leak of v2 cgroups

2020-05-09 20:59:21 -07:00

page_pool.c

…

pktgen.c

docs: networking: convert pktgen.txt to ReST

2020-04-30 12:56:37 -07:00

ptp_classifier.c

…

request_sock.c

…

rtnetlink.c

net: change addr_list_lock back to static key

2020-06-09 12:59:45 -07:00

scm.c

net: ignore sock_from_file errors in __scm_install_fd

2020-05-13 12:30:54 -07:00

secure_seq.c

crypto: lib/sha1 - remove unnecessary includes of linux/cryptohash.h

2020-05-08 15:32:17 +10:00

skbuff.c

net: unexport skb_gro_receive()

2020-05-19 19:55:36 -07:00

skmsg.c

bpf, sockmap: RCU dereferenced psock may be used outside RCU block

2020-06-28 08:33:28 -07:00

sock_diag.c

…

sock_map.c

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

2020-07-11 00:46:00 -07:00

sock_reuseport.c

…

sock.c

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

2020-07-11 00:46:00 -07:00

stream.c

…

sysctl_net_core.c

bpf: Check correct cred for CAP_SYSLOG in bpf_dump_raw_ok()

2020-07-08 16:01:21 -07:00

timestamping.c

…

tso.c

net: tso: add UDP segmentation support

2020-06-18 20:46:23 -07:00

utils.c

…

xdp.c

xdp: Handle frame_sz in xdp_convert_zc_to_xdp_frame()

2020-06-17 09:58:15 -07:00