Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/rocker/rocker.c between commit 5f2ebfbee688
("rocker: silence shift wrapping warning") from the net tree and commit
4a6bb6d35980 ("rocker: rename lport to pport") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/net/ethernet/rocker/rocker.c
index 9fb6948e14c6,e5a15a4c4e8f..000000000000
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@@ -1257,9 -1280,9 +1280,9 @@@ static void rocker_port_set_enable(stru
u64 val = rocker_read64(rocker_port->rocker, PORT_PHYS_ENABLE);
if (enable)
- val |= 1ULL << rocker_port->lport;
- val |= 1 << rocker_port->pport;
++ val |= 1ULL << rocker_port->pport;
else
- val &= ~(1ULL << rocker_port->lport);
- val &= ~(1 << rocker_port->pport);
++ val &= ~(1ULL << rocker_port->pport);
rocker_write64(rocker_port->rocker, PORT_PHYS_ENABLE, val);
}
Attachment:
pgp9BxOxCT4oV.pgp
Description: OpenPGP digital signature
