[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20150604213529.78c4a7f7@canb.auug.org.au>
Date: Thu, 4 Jun 2015 21:35:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@...driver.com>,
Ralf Baechle <ralf@...ux-mips.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the init tree with the mips tree
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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists