Re: linux-next: manual merge of the mips tree with Linus' tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux