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

Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.

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

2020-02-21 13:39:34 -08:00

..

actions.c

openvswitch: add TTL decrement action

2020-02-16 19:34:44 -08:00

conntrack.c

openvswitch: support asymmetric conntrack

2019-12-04 16:31:15 -08:00

conntrack.h

…

datapath.c

datapath.c: Use built-in RCU list checking

2020-02-18 12:46:27 -08:00

datapath.h

net: openvswitch: add hash info to upcall

2019-11-14 17:29:46 -08:00

dp_notify.c

…

flow_netlink.c

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

2020-02-21 13:39:34 -08:00

flow_netlink.h

…

flow_table.c

flow_table.c: Use built-in RCU list checking

2020-02-18 12:46:27 -08:00

flow_table.h

net: openvswitch: convert mask list in mask array

2019-11-03 17:18:03 -08:00

flow.c

Change in Openvswitch to support MPLS label depth of 3 in ingress direction

2019-11-05 18:02:29 -08:00

flow.h

treewide: Use sizeof_field() macro

2019-12-09 10:36:44 -08:00

Kconfig

…

Makefile

…

meter.c

meter.c: Use built-in RCU list checking

2020-02-18 12:46:26 -08:00

meter.h

…

vport-geneve.c

…

vport-gre.c

…

vport-internal_dev.c

…

vport-internal_dev.h

…

vport-netdev.c

…

vport-netdev.h

…

vport-vxlan.c

…

vport.c

vport.c: Use built-in RCU list checking

2020-02-18 12:46:27 -08:00

vport.h

…