* linux-next: manual merge of the init tree with the mips tree
@ 2015-06-04 11:35 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-06-04 11:35 UTC (permalink / raw)
To: Paul Gortmaker, Ralf Baechle; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
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@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-04 11:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-04 11:35 linux-next: manual merge of the init tree with the mips tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox