Hi, I just tried to pull from Linus' tree into my local tree and it seems that fast forward was committed even though the tree was dirty: ... drivers/media/video/cx88/cx88-input.c: needs update drivers/media/video/ir-kbd-i2c.c: needs update drivers/media/video/saa7134/saa7134-input.c: needs update include/linux/device.h: needs update include/linux/input.h: needs update fatal: Entry 'drivers/base/core.c' not uptodate. Cannot merge. Makefile | 4 +- arch/i386/kernel/nmi.c | 8 ---- arch/x86_64/kernel/nmi.c | 5 +-- drivers/base/core.c | 29 ++++++++++++++ drivers/hid/hid-core.c | 20 ++++----- drivers/net/natsemi.c | 58 +++++++++++++++------------- drivers/net/netxen/netxen_nic.h | 1 + drivers/net/netxen/netxen_nic_ethtool.c | 1 + drivers/net/netxen/netxen_nic_hw.c | 5 ++- drivers/net/netxen/netxen_nic_init.c | 11 ++++- drivers/net/skge.c | 28 ++++++++----- drivers/s390/cio/ccwgroup.c | 18 +++++++- drivers/scsi/scsi_sysfs.c | 14 ++++++- fs/sysfs/file.c | 64 ++++++++++++++++++++++++++++-- fs/sysfs/inode.c | 10 +++- include/asm-i386/nmi.h | 2 +- include/asm-x86_64/nmi.h | 2 +- include/linux/device.h | 2 + include/linux/sysfs.h | 9 ++++ 19 files changed, 211 insertions(+), 80 deletions(-) [dtor@anvil work]$ git --version git version 1.5.0.3.438.gc49b2 It used to refuse merge if there were conflicts... -- Dmitry - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html