[LinuxPPS] Git conflicts

[Rodolfo Giometti]

On Sun, Jul 29, 2007 at 07:17:54PM -0500, Philip M. White wrote:
> Hi, all;
> 
> Today I tried to patch my vanilla Linux repository (source:
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git)
> with LinuxPPS.  Here's what I got:
> 
> 83 objects were added to complete this thin pack.
>  100% (23883/23883) done
> Auto-merged MAINTAINERS
> CONFLICT (content): Merge conflict in MAINTAINERS
> Auto-merged arch/i386/kernel/syscall_table.S
> CONFLICT (content): Merge conflict in arch/i386/kernel/syscall_table.S
> Auto-merged drivers/Kconfig
> Auto-merged drivers/Makefile
> Auto-merged drivers/serial/8250.c
> Auto-merged drivers/serial/serial_core.c
> Auto-merged include/asm-i386/unistd.h
> CONFLICT (content): Merge conflict in include/asm-i386/unistd.h
> Auto-merged include/linux/Kbuild
> Auto-merged include/linux/serial_core.h
> Auto-merged include/linux/syscalls.h
> Auto-merged kernel/sys_ni.c
> Automatic merge failed; fix conflicts and then commit the result.
> 
> Is there an upper bound on the kernel version (or Git revision) that
> LinuxPPS supports?  What should I do?

Mmm... quite strange... did you modify your tree?

However you can give the command:

   git status

and sse which is the conflicting files. Then you can edit them and
keep the new part of them (the part between "====" and ">>>>"). After
this commit all changes by the command:

   git commit -a

Otherwise you can reset your kernel tree to linux 2.6.22 (in this
manner you *will loose* your modifications) by giving the command:

   git reset --hard v2.6.22

and the apply the patch ntp-pps-2.6.22-ter.diff. At the end commit the patch:

   git commit -a

and then you can try again a "git pull".

Ciao,

Rodolfo

-- 

GNU/Linux Solutions                  e-mail:    giometti at enneenne.com
Linux Device Driver                             giometti at gnudd.com
Embedded Systems                     		giometti at linux.it
UNIX programming                     phone:     +39 349 2432127