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