Messages in this thread | | | Date | Sat, 25 Aug 2012 21:32:37 +0200 | Subject | Re: linux-next: manual merge of the rr tree with the mips tree | From | Geert Uytterhoeven <> |
| |
Hi Stephen, David,
On Wed, Aug 22, 2012 at 5:11 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > Today's linux-next merge of the rr tree got a conflict in > arch/mips/kernel/module.c between commit c54de490a2e4 ("MIPS: Module: > Deal with malformed HI16/LO16 relocation sequences") from the mips tree > and commit 9db0bbe072c8 ("MIPS: Fix module.c build for 32 bit") from the > rr tree. > > Just context changes (I think). I fixed it up (see below) and can carry > the fix as necessary.
> + #endif
At first I thought this merge conflict resolution introduced the bogus #endif:
arch/mips/kernel/module.c:247:2: error: #endif without #if
(e.g. http://kisskb.ellerman.id.au/kisskb/buildresult/6999289/)
but it seems to be present already in David's commit bd029f48459adc8a72a2db95f7d79a7296c5ad5a ("Make most arch asm/module.h files use asm-generic/module.h")..
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |