lkml.org 
[lkml]   [2005]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2


    On Tue, 19 Apr 2005, Greg KH wrote:
    >
    > Ok, if you want some practice with "real" merges, feel free to merge from
    > the following two trees whenever you are ready:
    > kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
    > for 11 aoe bugfix patches, and:
    > kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
    > for 13 driver core, sysfs, and debugfs fixes.

    Done, pushed out. Can you verify that the end result looks sane to you? I
    just cheched that the diffstat looks similar (mine claims just 108 lines
    changed in aoecmd.c - possibly due to different diff formats).

    And yes, my new merge thing seems to have kept the index-cache much better
    up-to-date, allowing an optimized checkout-cache -f -a to work and only
    get the new files.

    Pasky? Can you check my latest git stuff, notably read-tree.c and the
    changes to git-pull-script?

    Linus
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-11-18 23:46    [W:0.019 / U:155.636 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site