Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.

In both cases code was added on both sides in the same place
so just keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2020-10-15 12:43:21 -07:00

..

tc_bpf.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

tc_connmark.h

…

tc_csum.h

net: Change TCA_ACT_* to TCA_ID_* to match that of TCA_ID_POLICE

2019-02-10 09:28:43 -08:00

tc_ct.h

net/sched: act_ct: Make tcf_ct_flow_table_restore_skb inline

2020-06-15 18:06:52 -07:00

tc_ctinfo.h

net: sched: act_ctinfo: tidy UAPI definition

2019-06-19 17:11:01 -04:00

tc_defact.h

…

tc_gact.h

net/sched: don't dereference a->goto_chain to read the chain index

2019-03-21 13:26:42 -07:00

tc_gate.h

net: schedule: add action gate offloading

2020-05-01 16:08:19 -07:00

tc_ife.h

net: tc_act: drop include of module.h from tc_ife.h

2019-04-22 21:50:53 -07:00

tc_ipt.h

…

tc_mirred.h

net: tc_act: add helpers to detect ingress mirred actions

2019-08-06 14:24:21 -07:00

tc_mpls.h

net: sched: include mpls actions in hardware intermediate representation

2019-07-23 13:52:50 -07:00

tc_nat.h

…

tc_pedit.h

net: Change TCA_ACT_* to TCA_ID_* to match that of TCA_ID_POLICE

2019-02-10 09:28:43 -08:00

tc_police.h

net:qos: police action offloading parameter 'burst' change to the original value

2020-06-29 17:33:42 -07:00

tc_sample.h

net: sched: take reference to psample group in flow_action infra

2019-09-16 09:18:03 +02:00

tc_skbedit.h

net: tc_skbedit: Make the skbedit priority offloadable

2020-03-19 21:09:19 -07:00

tc_skbmod.h

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

tc_tunnel_key.h

net: sched: Fix suspicious RCU usage while accessing tcf_tunnel_info

2020-10-15 09:10:11 -07:00

tc_vlan.h

net/sched: act_vlan: Add {POP,PUSH}_ETH actions

2020-10-03 17:28:45 -07:00