On Tue, Apr 19, 2005 at 01:20:47PM -0700, Linus Torvalds wrote: > > > 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).
Looks good to me (the diffstat difference is probably because the patches were consecutive, and the sum of them are smaller (modifying same parts of the files, etc.)) The git-changes-script shows that you picked up everything from my trees successfully (assuming we trust that so far) and a raw diff looks good too. Two "odd" things in the changelog: commit caaaaebc2380426b64aaa60a169834a7aefc956c tree 484292d57c19acbf04cf5c783e7d26181b95e96e parent 334a4e1b19f7f471594f7abd3bfead3720c1bd61 author Hugh Dickins <[EMAIL PROTECTED]> Wed, 20 Apr 2005 03:29:23 -0700 committer Linus Torvalds <[EMAIL PROTECTED](none)> Wed, 20 Apr 2005 03:29:23 -0700 It looks like your domain name isn't set up properly for your box (which is why it worked for you, but not me before, causing that patch). Also the date is in the future with the -0700, yet the time is in UTC. Oh wait, that's a 'git log' thing, the raw changeset is correct, I guess I'll wait for Pasky to fix that :) > 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. Very nice. thanks, greg k-h - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html