Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1158487 > unrolled thread

linux-next: manual merge of the init tree with the mips tree

Back to article view | Back to linux.kernel

Contents

  linux-next: manual merge of the init tree with the mips tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-04 13:40 +0200

#1158487 — linux-next: manual merge of the init tree with the mips tree

[Multipart message — attachments visible in raw view] — view raw

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

[toc] | [standalone]

Back to top | Article view | linux.kernel

csiph-web