6e03f896b5
Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| xgbe-common.h | ||
| xgbe-dcb.c | ||
| xgbe-debugfs.c | ||
| xgbe-desc.c | ||
| xgbe-dev.c | ||
| xgbe-drv.c | ||
| xgbe-ethtool.c | ||
| xgbe-main.c | ||
| xgbe-mdio.c | ||
| xgbe-ptp.c | ||
| xgbe.h | ||