On Tue, Sep 7, 2010 at 06:52, Greg Ungerer <[email protected]> wrote:
> m68k/m68knommu: merge MMU and non-MMU string.h
>
> The MMU and non-MMU string.h varients (string_no.h and string_mm.h)
> and almost the same. Switch to using the string_mm.h one, merging
> in the necessary ColdFire support.
>
> Signed-off-by: Greg Ungerer <[email protected]>
> ---
> arch/m68k/include/asm/{string_mm.h => string.h} | 16 ++--
> arch/m68k/include/asm/string_no.h | 126
> -----------------------
> 2 files changed, 9 insertions(+), 133 deletions(-)
> rename arch/m68k/include/asm/{string_mm.h => string.h} (98%)
> delete mode 100644 arch/m68k/include/asm/string_no.h
>
> diff --git a/arch/m68k/include/asm/string_mm.h
> b/arch/m68k/include/asm/string.h
> similarity index 98%
> rename from arch/m68k/include/asm/string_mm.h
> rename to arch/m68k/include/asm/string.h
> index 2eb7df1..2936dda 100644
> --- a/arch/m68k/include/asm/string_mm.h
> +++ b/arch/m68k/include/asm/string.h
Thanks!
How do you apply such renaming patches? I thought git can handle them, but
`git am' just says:
| Applying: m68k/m68knommu: merge MMU and non-MMU string.h
| error: arch/m68k/include/asm/string.h: already exists in index
| Patch failed at 0001 m68k/m68knommu: merge MMU and non-MMU string.h
| When you have resolved this problem run "git am --resolved".
| If you would prefer to skip this patch, instead run "git am --skip".
| To restore the original branch and stop patching run "git am --abort".
And according to "git status" no files have conflicts??
I ended up editing the patch to modify string_mm.h, and did the rename manually.
I applied all patches (except the hardirq one) and am currently
building my test kernels.
Now I see:
| arch/m68k/kernel/entry.S: Assembler messages:
| arch/m68k/kernel/entry.S:56: Error: can't resolve `0' {*ABS*
section} - `THREAD_SIZE' {*UND* section}
| arch/m68k/kernel/entry.S:64: Error: can't resolve `0' {*UND*
section} - `THREAD_SIZE' {*UND* section}
| arch/m68k/kernel/entry.S:119: Error: can't resolve `0' {*UND*
section} - `THREAD_SIZE' {*UND* section}
| arch/m68k/kernel/entry.S:203: Error: can't resolve `0' {*UND*
section} - `THREAD_SIZE' {*UND* section}
| arch/m68k/kernel/entry.S:236: Error: can't resolve `0' {*UND*
section} - `THREAD_SIZE' {*UND* section}
| arch/m68k/kernel/entry.S:257: Error: can't resolve `0' {*UND*
section} - `THREAD_SIZE' {*UND* section}
this is expanded from `GET_CURRENT'.
continuing...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
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
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
