Jakub Kicinski 0fe2f273ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/can/dev.c commit 03f16c5075 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e73 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-01-20 12:16:11 -08:00
..
act_api.c	net_sched: fix RTNL deadlock again caused by request_module()	2021-01-18 20:13:55 -08:00
act_bpf.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
act_connmark.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_csum.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_ct.c	net/sched: act_ct: enable stats for HW offloaded entries	2020-11-28 11:43:40 -08:00
act_ctinfo.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
act_gact.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_gate.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
act_ife.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_ipt.c	treewide: rename nla_strlcpy to nla_strscpy.	2020-11-16 08:08:54 -08:00
act_meta_mark.c
act_meta_skbprio.c
act_meta_skbtcindex.c
act_mirred.c	net/sched: sch_frag: add generic packet fragment support.	2020-11-27 14:36:02 -08:00
act_mpls.c	net/sched: act_mpls: ensure LSE is pullable before reading it	2020-12-03 11:13:37 -08:00
act_nat.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_pedit.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_police.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_sample.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_simple.c	treewide: rename nla_strlcpy to nla_strscpy.	2020-11-16 08:08:54 -08:00
act_skbedit.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_skbmod.c	net_sched: defer tcf_idr_insert() in tcf_action_init_1()	2020-09-24 19:46:21 -07:00
act_tunnel_key.c	net/sched: act_tunnel_key: fix OOB write in case of IPv6 ERSPAN tunnels	2020-10-20 21:10:41 -07:00
act_vlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-05 18:40:01 -07:00
cls_api.c	net_sched: fix RTNL deadlock again caused by request_module()	2021-01-18 20:13:55 -08:00
cls_basic.c
cls_bpf.c
cls_cgroup.c
cls_flow.c	Remove uninitialized_var() macro for v5.9-rc1	2020-08-04 13:49:43 -07:00
cls_flower.c	cls_flower: call nla_ok() before nla_next()	2021-01-15 15:48:53 -08:00
cls_fw.c
cls_matchall.c	net: qos offload add flow status with dropped count	2020-06-19 12:53:30 -07:00
cls_route.c	net_sched: cls_route: remove the right filter from hashtable	2020-03-16 01:59:32 -07:00
cls_rsvp.c
cls_rsvp.h	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
cls_rsvp6.c
cls_tcindex.c	net_sched: avoid shift-out-of-bounds in tcindex_set_parms()	2021-01-15 18:11:10 -08:00
cls_u32.c	net/sched: cls_u32: simplify the return expression of u32_reoffload_knode()	2020-12-08 16:22:53 -08:00
em_canid.c	net: sched: kerneldoc fixes	2020-07-13 17:20:40 -07:00
em_cmp.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
em_ipset.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_ipt.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_meta.c	sched: consistently handle layer3 header accesses in the presence of VLANs	2020-07-03 14:34:53 -07:00
em_nbyte.c	net: sched: Replace zero-length array with flexible-array member	2020-02-29 21:27:02 -08:00
em_text.c
em_u32.c
ematch.c	net: sched: kerneldoc fixes	2020-07-13 17:20:40 -07:00
Kconfig	net: sched: incorrect Kconfig dependencies on Netfilter modules	2020-12-09 15:49:29 -08:00
Makefile	net/sched: sch_frag: add generic packet fragment support.	2020-11-27 14:36:02 -08:00
sch_api.c	net_sched: reject silly cell_log in qdisc_get_rtab()	2021-01-15 18:06:45 -08:00
sch_atm.c	net: sched: convert tasklets to use new tasklet_setup() API	2020-11-07 10:41:15 -08:00
sch_blackhole.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_cake.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
sch_cbq.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
sch_cbs.c	net: don't include ethtool.h from netdevice.h	2020-11-23 17:27:04 -08:00
sch_choke.c	net: sched: prevent invalid Scell_log shift count	2020-12-28 14:52:54 -08:00
sch_codel.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_drr.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_dsmark.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_etf.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_ets.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_fifo.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_fq.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_fq_codel.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
sch_fq_pie.c	net/sched: fq_pie: initialize timer earlier in fq_pie_init()	2020-12-04 14:15:01 -08:00
sch_frag.c	net/sched: sch_frag: add generic packet fragment support.	2020-11-27 14:36:02 -08:00
sch_generic.c	net/sched: get rid of qdisc->padded	2020-10-09 08:08:08 -07:00
sch_gred.c	net: sched: prevent invalid Scell_log shift count	2020-12-28 14:52:54 -08:00
sch_hfsc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
sch_hhf.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_htb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2020-08-05 20:13:21 -07:00
sch_ingress.c
sch_mq.c
sch_mqprio.c
sch_multiq.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_netem.c	netem: fix zero division in tabledist	2020-10-29 11:45:47 -07:00
sch_pie.c	net: sched: fix misspellings using misspell-fixer tool	2020-11-10 17:00:28 -08:00
sch_plug.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_prio.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_qfq.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_red.c	net: sched: prevent invalid Scell_log shift count	2020-12-28 14:52:54 -08:00
sch_sfb.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_sfq.c	net: sched: prevent invalid Scell_log shift count	2020-12-28 14:52:54 -08:00
sch_skbprio.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_taprio.c	taprio: boolean values to a bool variable	2021-01-19 17:43:48 -08:00
sch_tbf.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00
sch_teql.c	Revert "net: sched: Pass root lock to Qdisc_ops.enqueue"	2020-07-16 16:48:34 -07:00