linux-kernel - Re: linux-next: manual merge of the mips tree with Linus' 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150213102847.GA30322@linux-mips.org>
Date:	Fri, 13 Feb 2015 11:28:47 +0100
From:	Ralf Baechle <ralf@...ux-mips.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Cowgill <James.Cowgill@...tec.com>,
	Markos Chandras <markos.chandras@...tec.com>
Subject: Re: linux-next: manual merge of the mips tree with Linus'  tree

On Fri, Feb 13, 2015 at 11:11:50AM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the mips tree got a conflict in
> arch/mips/kernel/elf.c between commit fd75a33e0002 ("MIPS: ELF: fix
> loading o32 binaries on 64-bit kernels") from Linus' tree and commit
> d8fb6537f1d4 ("MIPS: kernel: elf: Improve the overall ABI and FPU mode
> checks") from the mips tree.
> 
> I fixed it up (the latter seems to be a superset of the former) and can
> carry the fix as necessary (no action is required).

Due to an unrelated MIPS-specific issue I've yanked the merge that contained
this specific commit for the time being.

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/