Jakub Kicinski 7ff57803d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e1949 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e88a ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/[email protected]/

No adjacent changes.

Signed-off-by: Jakub Kicinski <[email protected]>

2023-08-18 12:44:56 -07:00

..

actions.c

net: openvswitch: add misc error drop reasons

2023-08-14 08:01:06 +01:00

conntrack.c

genetlink: remove userhdr from struct genl_info

2023-08-15 14:54:44 -07:00

conntrack.h

…

datapath.c

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

2023-08-18 12:44:56 -07:00

datapath.h

…

dp_notify.c

…

drop.h

net: openvswitch: add misc error drop reasons

2023-08-14 08:01:06 +01:00

flow_netlink.c

net: openvswitch: add explicit drop action

2023-08-14 08:01:06 +01:00

flow_netlink.h

…

flow_table.c

Merge tag 'mm-nonmm-stable-2023-02-20-15-29' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

2023-02-23 17:55:40 -08:00

flow_table.h

…

flow.c

net/sched: cls_api: Support hardware miss to tc action

2023-02-20 16:46:10 -08:00

flow.h

net: openvswitch: reduce cpu_used_mask memory

2023-02-06 22:36:29 -08:00

Kconfig

net: create nf_conntrack_ovs for ovs and tc use

2023-02-10 16:23:03 -08:00

Makefile

…

meter.c

genetlink: remove userhdr from struct genl_info

2023-08-15 14:54:44 -07:00

meter.h

…

openvswitch_trace.c

…

openvswitch_trace.h

…

vport-geneve.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport-gre.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport-internal_dev.c

openvswitch: Change the return type for vport_ops.send function hook to int

2022-09-19 18:28:50 -07:00

vport-internal_dev.h

…

vport-netdev.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport-netdev.h

…

vport-vxlan.c

rtnetlink: Honour NLM_F_ECHO flag in rtnl_delete_link

2022-10-31 18:10:21 -07:00

vport.c

net: openvswitch: fix upcall counter access before allocation

2023-06-07 12:25:05 +01:00

vport.h

net: openvswitch: Add support to count upcall packets

2022-12-09 10:43:46 +00:00