David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... 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>		2015-02-05 14:33:28 -08:00
..
common.h	xen-netback: always fully coalesce guest Rx packets	2015-01-23 18:01:58 -08:00
interface.c	xen-netback: stop the guest rx thread after a fatal error	2015-02-02 19:39:04 -08:00
Makefile
netback.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
xenbus.c	xen-netback: fixing the propagation of the transmit shaper timeout	2015-01-06 14:17:37 -05:00