David S. Miller
e800072c18
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
In netdevice.h we removed the structure in net-next that is being
changes in 'net'. In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.
The mlx5 conflicts have to do with vxlan support dependencies.
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-09 15:59:24 -04:00
2016-05-06 11:58:45 -07:00
2016-04-13 15:14:24 -04:00
2016-03-17 21:38:27 -07:00
2016-05-06 13:16:22 +02:00
2016-03-23 17:52:10 +02:00
2016-04-28 10:07:43 +02:00
2016-05-06 21:52:35 +02:00
2016-04-12 12:35:07 -07:00
2016-05-04 14:16:49 -04:00
2016-04-15 15:40:49 -07:00
2016-04-23 11:45:52 -07:00
2016-05-06 13:16:22 +02:00
2016-04-28 15:15:14 +02:00
2016-05-03 15:53:48 +08:00
2016-03-17 02:30:16 +01:00
2016-04-16 22:52:03 +05:30
2016-03-21 09:26:45 +01:00
2016-04-29 15:43:10 +02:00
2016-04-04 08:32:45 +09:00
2016-05-04 14:16:49 -04:00
2016-05-05 08:26:54 -07:00
2016-04-30 13:51:59 +02:00
2016-05-05 12:12:09 +10:00
2016-05-03 11:06:01 -07:00
2016-04-30 14:05:44 -07:00
2016-03-27 10:37:48 -07:00
2016-04-22 15:31:54 +02:00
2016-03-20 16:59:27 -04:00
2016-04-07 22:11:08 +02:00
2016-05-04 08:44:27 +01:00
2016-05-09 15:59:24 -04:00
2016-05-04 16:07:50 -07:00
2016-04-21 16:47:32 +02:00
2016-04-21 21:04:29 +02:00
2016-05-08 23:52:13 -04:00
2016-03-23 17:20:59 -07:00
2016-04-01 08:58:13 +02:00
2016-03-18 18:10:38 -07:00
2016-04-14 18:40:47 -07:00
2016-05-02 12:22:51 -07:00
2016-05-07 08:17:45 -07:00
2016-03-24 19:57:15 -07:00
2016-03-25 16:37:42 -07:00
2016-05-04 14:16:49 -04:00
2016-03-18 10:15:11 -07:00
2016-05-07 10:53:32 -07:00
2016-04-28 11:43:54 +02:00
2016-04-15 15:25:09 -07:00
2016-05-09 15:59:24 -04:00
2016-03-19 10:05:34 -07:00
2016-03-26 11:44:33 -04:00
2016-04-30 13:07:06 -07:00
2016-04-14 14:04:50 -06:00
2016-05-02 08:18:01 -07:00
2016-05-01 19:34:29 -04:00
2016-04-04 10:41:08 -07:00
2016-03-16 14:45:55 -07:00
2016-04-18 19:52:47 -07:00
2016-03-29 22:48:53 +02:00
2016-04-21 15:03:06 +01:00
2016-04-13 18:33:05 +05:30
2016-04-15 11:26:55 +02:00
2016-04-27 08:57:11 -07:00
2016-03-09 23:50:55 +01:00
2016-03-25 16:55:37 -07:00
2016-04-05 03:44:48 +02:00
2016-03-15 12:13:56 -07:00
2016-04-14 16:54:00 +02:00
2016-05-05 17:38:53 -07:00
2016-03-18 10:15:11 -07:00
2016-03-28 16:19:00 -07:00
2016-04-21 23:21:00 +02:00
2016-05-04 17:07:14 -04:00
2016-04-25 16:20:49 -04:00
2016-04-13 11:55:08 +02:00
2016-04-04 10:05:49 -07:00
2016-05-04 14:16:49 -04:00
2016-04-14 00:39:15 -04:00
2016-04-27 15:54:51 -07:00
2016-05-04 14:16:49 -04:00
2016-05-09 15:59:24 -04:00
2016-03-17 13:05:09 -07:00
2016-03-22 12:41:14 -07:00
2016-04-18 12:18:37 +03:00
2016-05-01 15:50:08 +03:00
2016-03-22 15:36:02 -07:00
2016-05-04 16:37:01 +01:00
e800072c18