Re: Linux/m68k merge status

[Geert U. <ge...@li...>]

On 5 Jan 2001, Andreas Schwab wrote:
> |>       o People with PC-style NVRAM (Atari), can you please check this? It's
> |> 	generic code.
> |> 	  drivers/char/nvram.c
> 
> Since the driver has been written by Roman Hodek, this should be ok.

I believe you :-) But since the PC nvram.c changed as well, I'm not sure that I
did the merge correctly.

> |>       o People with PC-style RTC (Atari and Q40), can you please check this?
> |>         It's generic code.
> |> 	  drivers/char/rtc.c
> |> 	  include/asm-alpha/mc146818rtc.h
> |> 	  include/asm-arm/mc146818rtc.h
> |> 	  include/asm-i386/mc146818rtc.h
> |> 	  include/asm-m68k/mc146818rtc.h
> |> 	  include/asm-m68k/rtc.h
> |> 	  include/asm-mips64/mc146818rtc.h
> |> 	  include/asm-mips/mc146818rtc.h
> |> 	  include/asm-ppc/mc146818rtc.h
> |> 	  include/asm-sparc64/mc146818rtc.h
> |> 	  include/asm-sparc/mc146818rtc.h
> 
> I think this should be negotiated with the author.

Same here. I had to resolve lots of conflicts.

If anyone can tell me that nvram and rtc stuff are OK, I'll do my best to sort
it out with the respective maintainers.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...

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