[LinuxPPS] need git help

[Jon Schewe]

As Udo pointed out.  I'm having some real problems here.

What I want to do seems fairly simple.  I want to use linuxpps with
kernel 2.6.18.  I read
http://wiki.enneenne.com/index.php/LinuxPPS_support#Downloading_the_code
and concluded that the following is what I was supposed to do, please
correct me where I'm wrong.

git clone
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.18.y.git
cd linux-2.6.18.y
git checkout -b pps 
git pull git://git.enneenne.com/linuxpps master

This didn't work, it gave me failures on merge.  Udo suggested that this
should work.  So I tried a different approach:
In a new directory:
git clone
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.18.y.git
git pull git://git.enneenne.com/linuxpps master
cd linuxpps
git-diff linux-vanilla master > ../patch
cd ../linux-2.6.18.y
patch -p1 < ../patch

This fails also.


________________________________________________________________________
http://lug.htc.honeywell.com/people/jschewe [Honeywell Intranet Only]
*My views may not represent those of my employers