Conflicts: net/openvswitch/vport-internal_dev.c Jesse Gross says: ==================== A couple of minor enhancements for net-next/3.10. The largest is an extension to allow variable length metadata to be passed to userspace with packets. There is a merge conflict in net/openvswitch/vport-internal_dev.c: A existing commit modifies internal_dev_mac_addr() and a new commit deletes it. The new one is correct, so you can just remove that function. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
actions.c | ||
datapath.c | ||
datapath.h | ||
dp_notify.c | ||
flow.c | ||
flow.h | ||
Kconfig | ||
Makefile | ||
vport-internal_dev.c | ||
vport-internal_dev.h | ||
vport-netdev.c | ||
vport-netdev.h | ||
vport.c | ||
vport.h |