Hi Paul,
Today's linux-next merge of the init tree got a conflict in
arch/mips/loongson64/common/serial.c between commit d4d269403794
("mips: make loongsoon serial driver explicitly modular") from the mips
tree and commit 3a283d1794f5 ("mips: make loongsoon serial driver
explicitly modular") from the init tree.
I fixed it up (I used the init tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpVhyVeom2iN.pgp
Description: OpenPGP digital signature
