[LinuxPPS] need git help

[Rodolfo Giometti]

On Wed, Nov 01, 2006 at 01:09:48PM -0600, Jon Schewe wrote:
>
> 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

Get the linuxPPS patch from the _same_ linux versions. LinuxPPS is now
updated to linux-2.6.19-rc2, so use that kernel version to extract
linuxPPS patch.

> cd linuxpps
> git-diff linux-vanilla master > ../patch
> cd ../linux-2.6.18.y
> patch -p1 < ../patch
> 
> This fails also.

Do as suggested above and the report the errors, please.

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