David S. Miller
36583eb54d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/cadence/macb.c
drivers/net/phy/phy.c
include/linux/skbuff.h
net/ipv4/tcp.c
net/switchdev/switchdev.c
Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.
phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.
tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.
macb.c involved the addition of two zyncq device entries.
skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
2015-05-06 08:03:20 +02:00
2014-09-26 11:02:55 +02:00
2015-05-04 14:26:14 +02:00
2015-04-22 09:20:15 -07:00
2015-03-26 15:13:09 +00:00
2014-09-26 11:02:55 +02:00
2013-11-13 12:09:14 +09:00
2015-04-11 15:19:31 +02:00
2015-03-20 07:41:56 -06:00
2015-04-16 22:05:27 -04:00
2015-04-18 11:10:49 -04:00
2015-04-14 16:49:00 -07:00
2014-05-27 13:56:21 -07:00
2015-01-30 01:52:17 +01:00
2013-10-30 01:21:24 +01:00
2015-03-09 21:06:18 +11:00
2014-10-28 09:06:11 -04:00
2015-04-15 12:10:24 -04:00
2015-05-23 01:22:35 -04:00
2015-02-18 08:49:20 -08:00
2015-04-21 09:44:55 -03:00
2015-04-21 09:42:58 -07:00
2014-09-21 17:03:04 -03:00
2014-05-26 12:53:40 +10:00
2014-01-07 11:54:28 +09:00
2014-05-05 15:32:05 +02:00
2015-04-24 07:08:41 -07:00
2014-07-17 18:43:40 -07:00
2014-02-28 15:12:08 -08:00
2015-04-18 11:10:49 -04:00
2015-04-10 22:22:56 +02:00
2015-04-05 06:01:00 -07:00
2015-03-27 16:53:39 +01:00
2015-02-13 17:15:44 +10:30
2014-02-10 16:01:40 -08:00
2014-08-10 20:36:00 -07:00
2015-04-21 12:54:08 -07:00
2015-02-26 15:45:06 -08:00
2014-04-16 14:13:27 -07:00
2015-02-19 10:31:37 -08:00
2014-12-10 17:41:10 -08:00
2014-01-08 15:32:51 -08:00
2015-03-03 09:00:08 -08:00
2015-03-09 17:18:00 -07:00
2015-02-11 13:03:11 -08:00
2014-02-10 16:01:40 -08:00
2014-12-05 11:18:36 -05:00
2014-08-26 09:35:53 +02:00
2015-01-29 12:56:20 -07:00
2014-06-11 08:35:34 -07:00
2015-05-22 23:59:17 -04:00
2014-12-08 12:56:06 +08:00
2015-04-18 11:10:49 -04:00
2014-09-26 11:02:55 +02:00
2014-03-08 12:39:44 +05:30
2014-06-10 19:11:06 -04:00
2015-04-14 20:21:54 -07:00
2015-04-30 15:24:58 +10:00
2014-10-28 08:46:27 -04:00
2014-10-24 16:07:10 -04:00
2014-08-08 15:57:24 -07:00
2015-01-15 23:34:34 -08:00
2015-05-18 12:14:17 -04:00
2015-04-04 15:20:26 +02:00
2015-03-05 20:53:06 +01:00
2015-03-31 10:35:31 -07:00
2015-05-10 19:26:37 +02:00
2015-04-13 14:14:29 +02:00
2015-04-17 09:04:12 -04:00
2015-04-17 09:04:07 -04:00
2015-04-19 22:40:26 -07:00
2015-01-06 14:39:17 -04:00
2015-02-26 11:57:29 -08:00
2015-04-03 16:17:03 +02:00
2015-03-24 22:57:49 +01:00
2014-10-25 10:53:44 -04:00
2015-04-08 06:35:16 -03:00
2015-05-11 17:17:50 +02:00
2015-04-18 11:10:49 -04:00
2014-06-19 17:45:14 -07:00
2014-09-26 11:02:55 +02:00
2015-04-03 15:26:15 +02:00
2014-01-15 00:25:14 +04:00
2015-04-04 15:20:26 +02:00
2014-12-29 15:28:24 -07:00
2014-09-26 11:10:11 +02:00
2013-12-02 11:24:18 +00:00
2015-02-26 11:57:31 -08:00
2014-10-14 02:18:16 +02:00
2015-02-10 14:30:31 -08:00
2014-12-29 15:33:17 -07:00
2013-12-03 10:08:57 -08:00
2015-02-02 14:23:42 -08:00
2015-02-27 11:44:24 -08:00
2015-04-18 11:10:49 -04:00
2015-03-05 13:37:01 +10:30
2014-05-29 15:50:30 +02:00
2014-04-04 09:50:07 -07:00
2014-09-26 11:22:29 +02:00
2014-05-26 17:28:27 -06:00
2014-05-05 15:32:05 +02:00
2015-04-21 14:47:16 +05:30
2014-05-20 16:54:21 -06:00
2014-04-09 13:44:34 -07:00
2014-05-05 15:32:05 +02:00
2014-06-04 08:50:34 -07:00
2014-04-30 19:57:05 +01:00
2015-03-20 07:41:55 -06:00
2015-01-19 12:05:32 +01:00
2013-11-13 12:09:34 +09:00
2015-02-17 14:34:54 -08:00
2014-10-28 09:06:11 -04:00
2014-05-04 09:49:46 +02:00
2013-12-02 14:48:28 +01:00
2015-05-05 14:24:45 -05:00
2015-04-01 17:21:35 +02:00
2014-04-07 16:36:11 -07:00
2014-05-25 12:39:00 -07:00
2015-05-05 17:10:10 -07:00
2015-04-28 12:48:57 +02:00
2015-02-26 11:57:30 -08:00
2015-03-20 07:41:55 -06:00
2014-10-24 13:59:03 -04:00
2014-12-08 09:07:11 -05:00
2015-03-20 07:41:55 -06:00
2014-11-24 10:49:54 -07:00
2014-12-13 12:42:53 -08:00
2014-08-26 09:35:52 +02:00
2014-09-28 11:08:00 +02:00
2014-04-16 14:20:34 -07:00
2014-11-03 11:54:50 -05:00
2015-02-24 06:45:25 +09:00
2015-02-23 07:16:46 -06:00
2013-12-02 14:45:19 +01:00
2015-04-18 11:10:49 -04:00
2015-03-20 07:41:55 -06:00
2015-04-30 09:35:41 -07:00
2015-01-20 14:02:58 -07:00
2014-12-22 15:40:48 +01:00
2014-11-21 19:48:50 +05:30
2015-03-18 02:02:20 +01:00
2015-04-18 11:10:49 -04:00
2014-05-21 11:19:36 +02:00
2014-12-11 13:38:31 -08:00
2014-05-05 15:32:05 +02:00
2015-01-09 23:22:12 +01:00
2013-11-30 14:08:28 +01:00
2014-05-05 15:32:05 +02:00
2015-03-24 22:01:58 -06:00
2015-03-26 23:52:24 +01:00
2013-12-02 14:45:19 +01:00
2014-06-19 15:15:27 +02:00
2015-04-17 09:03:57 -04:00
2014-09-19 14:44:51 -07:00
2014-09-26 11:03:00 +02:00
2013-12-06 16:37:43 -05:00
2014-08-05 15:28:48 +10:00
2013-12-03 11:15:58 -08:00
2014-09-23 23:44:16 -07:00
2013-11-26 11:09:08 +01:00
36583eb54d
