Messages in this thread | | | From | Rusty Russell <> | Subject | Re: linux-next: manual merge of the rr tree with the mips tree | Date | Tue, 28 Aug 2012 02:16:22 +0930 |
| |
Geert Uytterhoeven <geert@linux-m68k.org> writes: > 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
That was my bad rebase against another patch.
Fixed now, thanks.
Rusty.
| |