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

Today's linux-next merge of the kvm tree got a conflict in
arch/mips/kernel/genex.S between commit 6e81b3c78949 ("MIPS: Use
`FPU_CSR_ALL_X' in `__build_clear_fpe'") from the mips tree and commit
64bedffe4968 ("MIPS: Clear [MSA]FPE CSR.Cause after notify_die()") from
the kvm tree.

I fixed it up (the latter removed the code modified by the former) and
can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-04-07 11:01    [W:0.017 / U:0.428 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site