[lkml]   [2005]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
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:
> for 11 aoe bugfix patches, and:
> 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?

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

 \ /
  Last update: 2009-11-18 23:46    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean