Linus Torvalds <[EMAIL PROTECTED]> writes: > This corner-case was triggered by a kernel commit that was not in date > order, due to a misconfigured time zone that made the commit appear three > hours older than it was.
I have problems pulling linux kernel changes from 33ac02aa4cef417871e128ab4a6565e751e5f3b2 to b0825488a642cadcf39709961dde61440cb0731c into my local tree. At first I thought your patch would fix it, but it doesn't: r3000:~/git$ cat linux/.git/HEAD b0825488a642cadcf39709961dde61440cb0731c r3000:~/git$ git-clone-script -l linux linux.test defaulting to local storage area 0 blocks r3000:~/git$ cd linux.test/ r3000:~/git/linux.test$ echo 33ac02aa4cef417871e128ab4a6565e751e5f3b2 >.git/HEAD r3000:~/git/linux.test$ git-pull-script ../linux Packing 291 objects Unpacking 291 objects 100% (291/291) done Trying to merge b0825488a642cadcf39709961dde61440cb0731c into 33ac02aa4cef417871e128ab4a6565e751e5f3b2 Simple merge failed, trying Automatic merge Removing arch/mips/vr41xx/common/giu.c Auto-merging arch/s390/kernel/head.S. Auto-merging arch/s390/kernel/head64.S. Auto-merging arch/um/os-Linux/elf_aux.c. merge: warning: conflicts during merge ERROR: Merge conflict in arch/um/os-Linux/elf_aux.c. Auto-merging arch/x86_64/kernel/smp.c. Auto-merging arch/x86_64/kernel/smpboot.c. merge: warning: conflicts during merge ERROR: Merge conflict in arch/x86_64/kernel/smpboot.c. Auto-merging drivers/i2c/busses/i2c-mpc.c. merge: warning: conflicts during merge ERROR: Merge conflict in drivers/i2c/busses/i2c-mpc.c. Removing drivers/ide/cris/ide-v10.c Removing drivers/media/dvb/frontends/lgdt3302.c Removing drivers/media/dvb/frontends/lgdt3302.h Removing drivers/media/dvb/frontends/lgdt3302_priv.h Removing drivers/serial/bast_sio.c Auto-merging drivers/usb/input/hid-input.c. Auto-merging drivers/video/fbmem.c. Auto-merging include/asm-i386/bitops.h. merge: warning: conflicts during merge ERROR: Merge conflict in include/asm-i386/bitops.h. Auto-merging include/asm-x86_64/smp.h. Auto-merging kernel/sys.c. merge: warning: conflicts during merge ERROR: Merge conflict in kernel/sys.c. Removing net/ipv4/utils.c Removing sound/pcmcia/vx/vx_entry.c Removing sound/pcmcia/vx/vxp440.c fatal: merge program failed Automatic merge failed, fix up by hand -- Peter Osterlund - [EMAIL PROTECTED] http://web.telia.com/~u89404340 - 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
