lkml.org 
[lkml]   [2016]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the tip tree with the mips tree
Hi all,

Today's linux-next merge of the tip tree got a conflict in:

arch/mips/Kconfig

between commit:

7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC")

from the mips tree and commit:

7eb8c99db26c ("MIPS: Delete smp-gic.c")

from the tip tree.

I fixed it up (I used the tip tree version since that removed the lines
updated by the mips tree patch) and can carry the fix as necessary
(no action is required).

--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2016-03-14 04:01    [W:0.039 / U:0.240 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site