Not sure sure if I should commit

[Ken T. <ke...@we...>]

Hello,

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

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 ?

Ken.