[LinuxPPS] 23 Oct 18:33 - Useful debugging messages added.

[Rodolfo Giometti]

On Tue, Oct 24, 2006 at 07:34:50PM +0200, Udo van den Heuvel wrote:
> 
> How do I verify?

Use «git log», luke! :P

> I.e. pull down the whole tree again?
> 
> That would make git appear less usefull than a simple patch, like I
> argued before.
> I just want the few updates you posted today added to the linuxPPS patch.
> First I have to pull in the 2.6.19-rc2 update and now again the whole tree?
> Please say it aint so.

If the «git diff» returns no output, this means that the tree are
identical, so you may do like this:

1) git checkout linux-vanilla

2) git log | less

   and search the commit ID of the merge. It should be:

commit b3000239afb821839146546974263bf33e68d39c
Merge: b568985... 5cfc35c...
Author: Rodolfo Giometti <giometti at linux.it>
Date:   Sun Oct 22 18:43:50 2006 +0200

    Merging of Linux vanilla.
    
    Conflicts:
    
        include/linux/netlink.h

3) then find its parent:

commit b5689853da6cf8210e3fe368d7bd1a9959fb031d
Merge: bd9d34c... b0654df...
Author: Rodolfo Giometti <giometti at linux.it>
Date:   Tue Aug 15 17:17:48 2006 +0200

    Merge of branch "dev_time_pps_readlink".

4) Now reset the tree to that commit:

   git reset b5689853da6cf8210e3fe368d7bd1a9959fb031d

5) In the end re-update the linux-vanilla branch from kernel.org.

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