lkml.org 
[lkml]   [2015]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the mips tree with Linus' tree
Hi Ralf,

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).

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