Jakub Kicinski 8aaaf2f3af Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Merge in fixes directly in prep for the 5.17 merge window.
No conflicts.

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

2022-01-09 17:00:17 -08:00

..

actions.c

…

conntrack.c

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

2022-01-09 15:59:23 -08:00

conntrack.h

…

datapath.c

…

datapath.h

…

dp_notify.c

…

flow_netlink.c

…

flow_netlink.h

…

flow_table.c

…

flow_table.h

…

flow.c

net: openvswitch: Fix ct_state nat flags for conns arriving from tc

2022-01-09 16:24:12 -08:00

flow.h

…

Kconfig

…

Makefile

…

meter.c

include/linux/mm.h: move nr_free_buffer_pages from swap.h to mm.h

2021-11-06 13:30:43 -07:00

meter.h

…

openvswitch_trace.c

…

openvswitch_trace.h

…

vport-geneve.c

…

vport-gre.c

…

vport-internal_dev.c

…

vport-internal_dev.h

…

vport-netdev.c

openvswitch: add net device refcount tracker to struct vport

2021-12-07 20:45:00 -08:00

vport-netdev.h

…

vport-vxlan.c

…

vport.c

…

vport.h

openvswitch: add net device refcount tracker to struct vport

2021-12-07 20:45:00 -08:00