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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 7 Apr 2015 18:20:11 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Maciej W. Rozycki" <macro@...ux-mips.org>,
	James Hogan <james.hogan@...tec.com>
Subject: linux-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@...b.auug.org.au

Content of type "application/pgp-signature" skipped