mirror of https://github.com/torvalds/linux.git
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> |
||
|---|---|---|
| .. | ||
| android | ||
| board | ||
| clocking-wizard | ||
| comedi | ||
| cptm1217 | ||
| dgap | ||
| dgnc | ||
| emxx_udc | ||
| ft1000 | ||
| fwserial | ||
| gdm72xx | ||
| gdm724x | ||
| goldfish | ||
| gs_fpgaboot | ||
| iio | ||
| line6 | ||
| lustre | ||
| media | ||
| mt29f_spinand | ||
| netlogic | ||
| nvec | ||
| octeon | ||
| octeon-usb | ||
| olpc_dcon | ||
| ozwpan | ||
| panel | ||
| rtl8188eu | ||
| rtl8192e | ||
| rtl8192u | ||
| rtl8712 | ||
| rtl8723au | ||
| rts5208 | ||
| skein | ||
| slicoss | ||
| speakup | ||
| ste_rmi4 | ||
| unisys | ||
| vme | ||
| vt6655 | ||
| vt6656 | ||
| wlan-ng | ||
| xgifb | ||
| Kconfig | ||
| Makefile | ||
| staging.c | ||