Re: Not sure sure if I should commit

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

On Sun, 17 Sep 2000, Ken Tyler wrote:
> I was about to commit the heartbeat/soundfilter patch when I noticed this
> from a cvs ... status command :
> 
> File: ppc_ksyms.c       Status: File had conflicts on merge
> 
>    Working revision:    1.3
>    Repository revision: 1.3  /cvsroot/linux-apus/2.2/arch/ppc/kernel/ppc_ksyms.c,v
>    Sticky Tag:          (none)
>    Sticky Date:         (none)
>    Sticky Options:      (none)
> 
> This error/warning doesn't rate a mention in my book

Search for `^<<<' (`^' is start of line) in ppc_ksyms.c.

> All I'm trying to do is add 4 lines to ppc_ksyms.c :
> 
> diff -u -u -r1.3 ppc_ksyms.c
> --- arch/ppc/kernel/ppc_ksyms.c 2000/09/12 12:15:19     1.3
> +++ arch/ppc/kernel/ppc_ksyms.c 2000/09/16 11:32:35
> @@ -231,6 +231,11 @@
>  EXPORT_SYMBOL(memory);
>  #endif /* CONFIG_APUS */
> 
> +#ifdef CONFIG_HEARTBEAT
> +EXPORT_SYMBOL(enable_heartbeat);
> +EXPORT_SYMBOL(disable_heartbeat);
> +#endif
> +
>  #ifdef CONFIG_MOL
>  #include <asm/mmu_context.h>
>  extern PTE *Hash;
> 
> Is it safe to commit or what's wrong ?

Wouldn't it be better to implement it the same way as in 2.4.x? Iain Sandoe is
working on sharing the dmasound drivers between 2.2.x and 2.4.x.

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