diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-24 11:48:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-24 12:06:19 -0800 |
| commit | 70f3522614e60b6125eff5f9dd7c887543812187 (patch) | |
| tree | 5e08ed970fb035feb4a99ac8526c74da0d445d01 /security/keys/keyctl_pkey.c | |
| parent | a75d1d01477d5235aac613c167b0653441281ad7 (diff) | |
| parent | c3619a482e15d98e1d2eb6b32952e753077e7545 (diff) | |
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>
Diffstat (limited to 'security/keys/keyctl_pkey.c')
0 files changed, 0 insertions, 0 deletions