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
..
2015-01-28 00:03:34 +01:00
2014-09-18 10:54:36 +02:00
2013-12-28 17:02:46 -05:00
2013-11-07 19:28:58 -05:00
2014-09-30 01:02:26 -04:00
2014-06-04 22:46:38 -07:00
2015-01-18 01:56:32 -05:00
2014-01-03 20:56:48 -05:00
2014-12-19 00:19:23 +01:00
2015-01-15 18:26:16 -05:00
2014-06-02 11:00:41 -07:00
2014-05-22 14:57:15 -04:00
2014-10-01 21:35:51 -04:00