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
2014-12-14 16:43:47 -08:00
2015-01-23 21:47:55 +02:00
2015-01-08 20:36:57 +03:00
2014-12-15 17:05:08 -08:00
2014-12-14 14:05:05 -08:00
2014-12-14 14:57:16 -08:00
2014-12-15 17:30:09 -08:00
2015-01-16 12:05:35 +00:00
2015-02-05 14:33:28 -08:00
2014-12-15 18:19:03 -08:00
2015-01-26 16:09:45 -08:00
2014-12-23 15:44:32 +05:30
2015-01-28 00:03:36 +01:00
2014-12-14 14:57:16 -08:00
2015-01-05 23:34:26 +01:00
2014-12-23 18:13:16 -08:00
2014-12-13 12:42:51 -08:00
2014-12-14 16:10:09 -08:00
2015-01-08 08:59:01 -07:00
2015-01-08 08:55:53 -07:00
2014-12-13 14:14:23 -08:00
2014-12-11 18:57:19 -08:00
2014-12-30 18:29:25 -05:00
2014-12-18 19:08:10 -08:00
2014-12-13 12:42:51 -08:00
2015-01-13 20:39:09 +01:00
2014-12-17 09:00:04 -04:00
2014-12-17 02:26:28 +01:00
2014-12-14 16:10:09 -08:00
2014-12-19 22:55:06 +01:00
2014-12-14 16:10:09 -08:00
2015-01-02 15:46:41 -05:00
2014-12-13 12:42:52 -08:00
2014-12-31 13:06:50 -05:00
2015-01-08 15:10:52 -08:00
2014-12-13 12:42:53 -08:00
2014-12-15 10:17:38 -05:00
2015-01-16 17:04:25 -05:00
2014-12-13 12:42:48 -08:00
2014-12-12 11:15:33 +01:00
2015-01-26 22:05:20 +01:00
2015-01-27 11:09:13 +01:00
2015-01-18 00:23:57 -05:00
2015-02-05 14:33:28 -08:00
2014-12-12 15:15:41 -05:00
2014-12-16 14:53:01 -08:00
2014-12-16 15:53:03 -08:00
2015-02-02 19:28:04 -08:00
2014-12-13 13:33:07 +01:00
2015-02-01 12:23:32 -08:00
2014-12-13 12:42:47 -08:00
2014-12-15 13:06:40 +01:00
2014-12-18 09:39:51 +01:00
2014-12-15 18:28:25 -08:00
2015-01-19 09:10:07 -05:00
2015-01-04 23:11:43 -05:00
2014-12-13 12:42:49 -08:00
2014-12-17 08:26:51 -05:00
2014-12-13 12:42:48 -08:00
2015-01-29 10:51:32 -08:00
2014-12-15 15:52:01 -08:00
2014-12-13 12:42:48 -08:00
2015-01-22 11:15:54 +10:30
2015-01-20 11:38:33 +10:30
2015-02-01 23:16:33 -08:00
2015-02-04 16:14:24 -08:00
2014-12-27 03:07:50 -05:00
2015-01-05 19:40:53 -08:00
2015-01-26 13:37:18 -08:00
2014-12-13 12:42:48 -08:00
2014-12-13 12:42:48 -08:00
2014-12-29 12:45:45 -08:00
2014-12-14 14:57:16 -08:00
2015-01-16 10:04:42 -06:00
2014-12-13 12:42:53 -08:00
2014-12-11 18:36:26 -08:00
2015-01-28 13:17:35 +01:00
2015-01-09 11:12:28 +01:00
2014-12-16 15:02:23 -05:00
2015-01-27 00:16:51 -08:00
2014-12-29 21:24:00 +01:00
2014-12-12 15:26:48 -08:00
2014-12-13 00:45:24 +01:00
2015-01-26 13:37:18 -08:00
2015-01-28 09:01:40 +01:00
2015-01-28 09:01:40 +01:00
2014-12-13 12:42:52 -08:00
2014-12-12 10:08:06 -08:00
2015-02-04 20:34:52 -08:00
2015-01-08 15:10:51 -08:00
2014-12-13 12:42:51 -08:00
2014-12-13 12:42:48 -08:00
2015-02-04 20:46:55 -08:00
2014-12-13 12:42:49 -08:00
2015-02-04 01:34:15 -05:00
2015-01-03 14:32:57 -05:00
2015-01-03 14:32:57 -05:00
2015-01-03 14:32:57 -05:00
2014-12-13 12:42:48 -08:00
2014-12-13 12:42:47 -08:00
2014-12-13 12:42:51 -08:00
2014-12-21 22:49:12 +08:00
2015-01-22 12:28:02 +01:00
2015-01-02 16:47:35 -05:00
2014-12-30 18:29:25 -05:00
2015-01-05 22:44:46 -05:00
2015-02-04 01:34:16 -05:00
2014-12-17 12:31:40 -08:00
2014-12-14 18:21:31 +02:00
2014-12-17 10:37:56 -08:00
2014-12-13 12:42:48 -08:00
2015-02-04 01:34:14 -05:00
2014-12-15 23:49:28 +02:00
2015-01-08 15:10:51 -08:00
6e03f896b5