David S. Miller
70f3522614
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.
The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.
However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-02-24 12:06:19 -08:00
2018-06-18 22:40:32 +02:00
2019-02-15 12:38:38 -08:00
2019-02-20 00:34:07 -08:00
2018-06-12 16:19:22 -07:00
2018-11-09 11:39:44 +01:00
2019-02-22 13:46:55 +01:00
2019-02-08 13:56:37 +01:00
2019-02-22 13:45:51 +01:00
2018-06-29 09:53:09 +02:00
2018-06-18 22:40:32 +02:00
2019-01-19 09:53:49 +01:00
2019-02-08 13:51:50 +01:00
2019-02-22 13:42:54 +01:00
2018-12-20 11:53:36 -08:00
2018-12-05 15:32:28 +01:00
2018-09-05 10:15:48 +02:00
2018-07-05 23:21:10 +02:00
2019-02-24 12:06:19 -08:00
2018-10-11 16:01:01 +02:00
2019-02-08 13:51:50 +01:00
2019-02-22 13:48:48 +01:00
2019-02-08 13:51:50 +01:00
2019-02-08 13:51:50 +01:00
2019-02-20 00:34:07 -08:00
2018-02-22 21:13:03 +01:00
2019-02-22 13:46:25 +01:00
2018-06-15 13:34:40 +02:00
2018-10-11 16:01:01 +02:00
2018-10-11 16:01:05 +02:00
2019-01-19 09:56:56 +01:00
2019-01-19 09:56:56 +01:00
2018-10-11 16:01:02 +02:00
2018-10-11 16:01:05 +02:00
2018-10-11 16:01:05 +02:00
2019-02-24 12:06:19 -08:00
2019-02-08 13:56:37 +01:00
2019-02-22 13:42:54 +01:00
2019-01-19 09:31:43 +01:00
2019-02-01 12:11:13 +01:00
2019-01-19 09:31:43 +01:00
2019-02-08 13:51:50 +01:00
2019-02-22 13:45:51 +01:00
2019-02-08 15:00:17 -08:00
2019-02-22 13:48:13 +01:00
2018-09-05 10:03:14 +02:00
2018-11-20 14:26:55 +08:00
2018-02-22 21:13:03 +01:00
70f3522614