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