[LinuxPPS] need git help

[James Boddington]

Jon Schewe wrote:
> 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

I don't think this will work. The git clone will give you a copy of the 
2.6.18.1 tree but I expect the git pull to update the tree to 2.6.19-rc2 which 
I suspect is not what you want.

> 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.

Do you get several Hunk succeeded at offset whatever with the following Hunk 
FAILED?

patching file include/linux/netlink.h
Hunk #1 FAILED at 21.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/netlink.h.rej

The linuxpps tree is currently based on 2.6.19-rc2 and there was a small change 
to netlink.h the breaks appling the patch to 2.6.18.X. I had the same problem 
going the other way using a 2.6.18 linuxpps patch on 2.6.19-rc2.

This small patch should do what the failed Hunk should have done.

--- include/linux/netlink.h.orig        2006-11-02 09:04:31.513723260 +1000
+++ include/linux//netlink.h    2006-11-02 09:22:41.419486220 +1000
@@ -21,6 +21,7 @@
  #define NETLINK_DNRTMSG                14      /* DECnet routing messages */
  #define NETLINK_KOBJECT_UEVENT 15      /* Kernel messages to userspace */
  #define NETLINK_GENERIC                16
+#define NETLINK_PPSAPI         17      /* linuxPPS support */

  #define MAX_LINKS 32


-- 
    James