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

[Stephen Rothwell]

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                    s...@canb.auug.org.au

pgpKMV7QMlGq3.pgp
Description: OpenPGP digital signature