{"thread":{"id":"3419","subject":"merging problems with Linus' kernel tree.","startedAt":"2006-02-21T18:33:06Z","lastAt":"2006-02-21T20:29:35Z","messageCount":5,"participants":["Dave Jones","Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16511","messageId":"20060221183306.GC22988@redhat.com","threadId":"3419","inReplyTo":null,"subject":"merging problems with Linus' kernel tree.","fromName":"Dave Jones","fromEmail":"davej@redhat.com","sentAt":"2006-02-21T18:33:06Z","receivedAt":"2006-02-21T18:33:06Z","isPatch":false,"sender":{"key":"davej@redhat.com","avatar":null},"body":"I did my morning 'git pull' on Linus' tree to a clean tree\nthat I never make any commits to, and got this ...\n\n$ git pull\nUnpacking 2425 objects\n 100% (2425/2425) done\n* refs/heads/origin: fast forward to branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\nAuto-following refs/tags/v2.6.16-rc3\nAuto-following refs/tags/v2.6.16-rc4\nUnpacking 2 objects\n 100% (2/2) done\n* refs/tags/v2.6.16-rc4: storing tag 'v2.6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n* refs/tags/v2.6.16-rc3: storing tag 'v2.6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\nUpdating from 418aade459f03318defd18ef0b11981a63bd81b0 to 5914811acf36c3ff091f860a6964808f668f27d0.\nDocumentation/cpu-hotplug.txt: needs update\nfatal: Entry 'Documentation/cpu-hotplug.txt' would be overwritten by merge. Cannot merge.\n\n$ git-fsck-objects\ndangling commit 5914811acf36c3ff091f860a6964808f668f27d0\n\n$ git-cat-file commit 5914811acf36c3ff091f860a6964 808f668f27d0\ntree 04317a64fa5e76a13f29de655fe354abd627445d\nparent 6d7b9efacba9f4e5f4d5ca165b1a4350da52ddd7\nauthor Bj�rn Steinbrink <B.Steinbrink@gmx.de> 1140282763 +0100\ncommitter Linus Torvalds <torvalds@g5.osdl.org> 1140496058 -0800\n\n[PATCH] kjournald keeps reference to namespace\n\nIn daemonize() a new thread gets cleaned up and 'merged' with init_task.\nThe current fs_struct is handled there, but not the current namespace.\n\nThis adds the namespace part.\n\n[ Eric Biederman pointed out the namespace wrappers, and also notes that\nwe can't ever count on using our parents namespace because we already\nhave called exit_fs(), which is the only way to the namespace from a\nprocess. ]\n\nSigned-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>\nAcked-by: Eric Biederman <ebiederm@xmission.com>\nSigned-off-by: Linus Torvalds <torvalds@osdl.org>\n\n\nI ran a fsck on the disk, and that turned up nothing, so I'm\nnot expecting any local fs corruption.\nWhat's up with this, and how do I fix it?\n\n\t\tDave\n"},{"id":"16514","messageId":"Pine.LNX.4.64.0602211052360.30245@g5.osdl.org","threadId":"3419","inReplyTo":"20060221183306.GC22988@redhat.com","subject":"Re: merging problems with Linus' kernel tree.","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-02-21T18:55:15Z","receivedAt":"2006-02-21T18:55:15Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Tue, 21 Feb 2006, Dave Jones wrote:\n>\n> Documentation/cpu-hotplug.txt: needs update\n> fatal: Entry 'Documentation/cpu-hotplug.txt' would be overwritten by merge. Cannot merge.\n\nThis means that it's dirty in the index, not that you've committed any \nchanges.\n\nDo a \"git diff\".\n\n(It may also be that the diff is empty, and only shows the filename. That \nmeans that you've changed the mtime - for example edited it, and then \nundone the edit - so that the file is dirty in the index, even if the \n_contents_ are the same. If so, do a \"git-update-index --refresh\" or \nsimilar, or just ask for \"git status\", which will do it for you as part of \nchecking the status of all your files).\n\n\t\tLinus\n"},{"id":"16515","messageId":"20060221191948.GE22988@redhat.com","threadId":"3419","inReplyTo":"Pine.LNX.4.64.0602211052360.30245@g5.osdl.org","subject":"Re: merging problems with Linus' kernel tree.","fromName":"Dave Jones","fromEmail":"davej@redhat.com","sentAt":"2006-02-21T19:19:48Z","receivedAt":"2006-02-21T19:19:48Z","isPatch":false,"sender":{"key":"davej@redhat.com","avatar":null},"body":"On Tue, Feb 21, 2006 at 10:55:15AM -0800, Linus Torvalds wrote:\n > \n > \n > On Tue, 21 Feb 2006, Dave Jones wrote:\n > >\n > > Documentation/cpu-hotplug.txt: needs update\n > > fatal: Entry 'Documentation/cpu-hotplug.txt' would be overwritten by merge. Cannot merge.\n > \n > This means that it's dirty in the index, not that you've committed any \n > changes.\n > \n > Do a \"git diff\".\n\nFor some reason, that shows that file being deleted.\n\ndiff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt\ndeleted file mode 100644\nindex e71bc6c..0000000\n--- a/Documentation/cpu-hotplug.txt\n+++ /dev/null\n@@ -1,373 +0,0 @@\n\n...\n\n > (It may also be that the diff is empty, and only shows the filename. That \n > means that you've changed the mtime - for example edited it, and then \n > undone the edit\n\nHmm, this tree is on NFS.   The server was 2-3 seconds ahead of the client\n(for some reason ntp wasn't running), but I wouldn't expect such chaos\nto ensue from this?\n\n > - so that the file is dirty in the index, even if the \n > _contents_ are the same. If so, do a \"git-update-index --refresh\" or \n > similar, or just ask for \"git status\", which will do it for you as part of \n > checking the status of all your files).\n\nHmm. git status shows a ton of modified files, that I know I've never touched.\n(arch/frv is somewhere I'd rather not venture)\n\n#\n# Updated but not checked in:\n#   (will commit)\n#\n#       modified: Documentation/cpu-hotplug.txt\n#       new file: Documentation/fujitsu/frv/kernel-ABI.txt\n#       modified: Documentation/hwmon/w83627hf\n#       modified: Documentation/kernel-parameters.txt\n#       modified: Documentation/kprobes.txt\n#       modified: Documentation/mips/AU1xxx_IDE.README\n#       modified: Documentation/powerpc/booting-without-of.txt\n#       modified: Documentation/scsi/ChangeLog.megaraid_sas\n#       modified: MAINTAINERS\n#       modified: Makefile\n#       modified: arch/arm/kernel/calls.S\n#       modified: arch/arm/kernel/setup.c\n#       modified: arch/arm/kernel/smp.c\n#       modified: arch/arm/kernel/sys_oabi-compat.c\n#       modified: arch/arm/mach-integrator/platsmp.c\n#       modified: arch/arm/mach-iop3xx/iop321-setup.c\n#       modified: arch/arm/mach-iop3xx/iop331-setup.c\n#       modified: arch/arm/mach-ixp4xx/nslu2-setup.c\n#       modified: arch/arm/mach-realview/platsmp.c\n#       modified: arch/arm/mach-s3c2410/mach-h1940.c\n#       new file: arch/arm/mach-s3c2410/s3c2400.h\n#       modified: arch/arm/plat-omap/pm.c\n#       modified: arch/frv/Kconfig\n#       modified: arch/frv/Makefile\n#       modified: arch/frv/kernel/break.S\n#       modified: arch/frv/kernel/entry-table.S\n#       modified: arch/frv/kernel/entry.S\n#       modified: arch/frv/kernel/head.S\n#       modified: arch/frv/kernel/irq.c\n#       modified: arch/frv/mm/kmap.c\n#       modified: arch/h8300/Kconfig\n#       modified: arch/h8300/Kconfig.cpu\n#       new file: arch/i386/boot/.gitignore\n#       new file: arch/i386/boot/tools/.gitignore\n#       new file: arch/i386/kernel/.gitignore\n#       modified: arch/i386/kernel/cpu/transmeta.c\n#       modified: arch/i386/kernel/head.S\n#       modified: arch/i386/kernel/syscall_table.S\n#       modified: arch/i386/kernel/timers/timer_tsc.c\n#       modified: arch/i386/kernel/vsyscall-sysenter.S\n#       modified: arch/i386/oprofile/backtrace.c\n#       modified: arch/ia64/kernel/acpi.c\n#       modified: arch/ia64/kernel/entry.S\n#       modified: arch/ia64/kernel/ia64_ksyms.c\n#       modified: arch/ia64/kernel/setup.c\n#       modified: arch/ia64/kernel/smpboot.c\n#       modified: arch/ia64/kernel/time.c\n#       modified: arch/ia64/kernel/traps.c\n#       modified: arch/ia64/sn/kernel/io_init.c\n#       modified: arch/ia64/sn/kernel/setup.c\n#       modified: arch/ia64/sn/kernel/sn2/prominfo_proc.c\n#       modified: arch/ia64/sn/kernel/sn2/sn2_smp.c\n#       modified: arch/ia64/sn/kernel/sn2/sn_proc_fs.c\n#       modified: arch/ia64/sn/kernel/sn2/timer.c\n#       modified: arch/ia64/sn/kernel/sn2/timer_interrupt.c\n#       modified: arch/ia64/sn/kernel/tiocx.c\n#       modified: arch/ia64/sn/kernel/xpc_channel.c\n#       modified: arch/ia64/sn/kernel/xpc_main.c\n#       modified: arch/ia64/sn/pci/pci_dma.c\n#       modified: arch/ia64/sn/pci/pcibr/pcibr_ate.c\n#       modified: arch/ia64/sn/pci/pcibr/pcibr_dma.c\n#       modified: arch/ia64/sn/pci/pcibr/pcibr_provider.c\n#       modified: arch/m68k/Kconfig\n#       modified: arch/m68k/fpsp040/bindec.S\n#       modified: arch/m68k/fpsp040/binstr.S\n#       modified: arch/m68k/fpsp040/bugfix.S\n#       modified: arch/m68k/fpsp040/decbin.S\n#       modified: arch/m68k/fpsp040/do_func.S\n#       modified: arch/m68k/fpsp040/fpsp.h\n#       modified: arch/m68k/fpsp040/gen_except.S\n#       modified: arch/m68k/fpsp040/get_op.S\n#       modified: arch/m68k/fpsp040/kernel_ex.S\n#       modified: arch/m68k/fpsp040/res_func.S\n#       modified: arch/m68k/fpsp040/round.S\n#       modified: arch/m68k/fpsp040/sacos.S\n#       modified: arch/m68k/fpsp040/sasin.S\n#       modified: arch/m68k/fpsp040/satan.S\n#       modified: arch/m68k/fpsp040/satanh.S\n#       modified: arch/m68k/fpsp040/scale.S\n#       modified: arch/m68k/fpsp040/scosh.S\n#       modified: arch/m68k/fpsp040/setox.S\n#       modified: arch/m68k/fpsp040/sgetem.S\n#       modified: arch/m68k/fpsp040/sint.S\n#       modified: arch/m68k/fpsp040/skeleton.S\n#       modified: arch/m68k/fpsp040/slog2.S\n#       modified: arch/m68k/fpsp040/slogn.S\n#       modified: arch/m68k/fpsp040/smovecr.S\n#       modified: arch/m68k/fpsp040/srem_mod.S\n#       modified: arch/m68k/fpsp040/ssin.S\n#       modified: arch/m68k/fpsp040/ssinh.S\n#       modified: arch/m68k/fpsp040/stan.S\n#       modified: arch/m68k/fpsp040/stanh.S\n#       modified: arch/m68k/fpsp040/sto_res.S\n#       modified: arch/m68k/fpsp040/stwotox.S\n#       modified: arch/m68k/fpsp040/tbldo.S\n#       modified: arch/m68k/fpsp040/util.S\n#       modified: arch/m68k/fpsp040/x_bsun.S\n#       modified: arch/m68k/fpsp040/x_fline.S\n#       modified: arch/m68k/fpsp040/x_operr.S\n#       modified: arch/m68k/fpsp040/x_ovfl.S\n#       modified: arch/m68k/fpsp040/x_snan.S\n#       modified: arch/m68k/fpsp040/x_store.S\n#       modified: arch/m68k/fpsp040/x_unfl.S\n#       modified: arch/m68k/fpsp040/x_unimp.S\n#       modified: arch/m68k/fpsp040/x_unsupp.S\n#       modified: arch/m68knommu/Kconfig\n#       modified: arch/mips/Makefile\n#       modified: arch/mips/kernel/process.c\n#       modified: arch/mips/kernel/scall32-o32.S\n#       modified: arch/mips/kernel/signal-common.h\n#       modified: arch/mips/kernel/signal32.c\n#       modified: arch/mips/kernel/signal_n32.c\n#       modified: arch/mips/kernel/smp_mt.c\n#       modified: arch/mips/mm/c-r4k.c\n#       modified: arch/mips/mm/c-tx39.c\n#       modified: arch/parisc/Kconfig\n#       modified: arch/parisc/kernel/syscall_table.S\n#       modified: arch/powerpc/Kconfig\n#       modified: arch/powerpc/Makefile\n#       modified: arch/powerpc/kernel/Makefile\n#       modified: arch/powerpc/kernel/systbl.S\n#       modified: arch/ppc/kernel/misc.S\n#       modified: arch/s390/Kconfig\n#       modified: arch/s390/defconfig\n#       modified: arch/s390/kernel/compat_linux.c\n#       modified: arch/s390/kernel/compat_signal.c\n#       modified: arch/s390/kernel/compat_wrapper.S\n#       modified: arch/s390/kernel/machine_kexec.c\n#       modified: arch/s390/kernel/process.c\n#       modified: arch/s390/kernel/setup.c\n#       modified: arch/s390/kernel/smp.c\n#       modified: arch/s390/kernel/syscalls.S\n#       modified: arch/s390/lib/delay.c\n#       modified: arch/sh/Kconfig\n#       modified: arch/sparc/kernel/systbls.S\n#       modified: arch/sparc64/kernel/sys_sparc32.c\n#       modified: arch/sparc64/kernel/systbls.S\n#       modified: arch/v850/Kconfig\n#       modified: arch/x86_64/defconfig\n#       modified: arch/x86_64/ia32/ia32entry.S\n#       modified: arch/x86_64/ia32/sys_ia32.c\n#       modified: arch/x86_64/kernel/apic.c\n#       modified: arch/x86_64/kernel/entry.S\n#       modified: arch/x86_64/kernel/head.S\n#       modified: arch/x86_64/kernel/io_apic.c\n#       modified: arch/x86_64/kernel/mpparse.c\n#       modified: arch/x86_64/kernel/nmi.c\n#       modified: arch/x86_64/kernel/pci-gart.c\n#       modified: arch/x86_64/kernel/time.c\n#       modified: arch/x86_64/kernel/traps.c\n#       modified: arch/x86_64/mm/k8topology.c\n#       modified: arch/x86_64/mm/numa.c\n#       modified: arch/x86_64/mm/srat.c\n#       modified: drivers/acpi/resources/rscalc.c\n#       modified: drivers/block/pktcdvd.c\n#       modified: drivers/bluetooth/bt3c_cs.c\n#       modified: drivers/char/drm/drm_pciids.h\n#       modified: drivers/char/esp.c\n#       modified: drivers/char/hpet.c\n#       modified: drivers/char/tipar.c\n#       modified: drivers/char/tpm/tpm_infineon.c\n#       modified: drivers/char/tty_io.c\n#       modified: drivers/char/watchdog/pcwd.c\n#       modified: drivers/char/watchdog/sa1100_wdt.c\n#       modified: drivers/cpufreq/cpufreq.c\n#       modified: drivers/hwmon/it87.c\n#       modified: drivers/hwmon/vt8231.c\n#       modified: drivers/hwmon/w83781d.c\n#       modified: drivers/i2c/busses/i2c-isa.c\n#       modified: drivers/ide/ide-taskfile.c\n#       modified: drivers/ide/pci/sgiioc4.c\n#       modified: drivers/infiniband/core/mad.c\n#       modified: drivers/infiniband/hw/mthca/mthca_cmd.c\n#       modified: drivers/infiniband/hw/mthca/mthca_dev.h\n#       modified: drivers/infiniband/ulp/ipoib/ipoib.h\n#       modified: drivers/infiniband/ulp/ipoib/ipoib_multicast.c\n#       modified: drivers/input/keyboard/Makefile\n#       modified: drivers/input/misc/Makefile\n#       modified: drivers/input/misc/ixp4xx-beeper.c\n#       modified: drivers/input/mouse/logips2pp.c\n#       modified: drivers/input/mouse/trackpoint.c\n#       modified: drivers/input/mouse/trackpoint.h\n#       modified: drivers/input/serio/Makefile\n#       modified: drivers/input/touchscreen/ads7846.c\n#       modified: drivers/isdn/i4l/isdn_tty.c\n#       modified: drivers/macintosh/windfarm_smu_sat.c\n#       modified: drivers/message/fusion/mptbase.c\n#       modified: drivers/message/fusion/mptbase.h\n#       modified: drivers/message/fusion/mptctl.c\n#       modified: drivers/message/fusion/mptctl.h\n#       modified: drivers/message/fusion/mptscsih.c\n#       modified: drivers/mmc/mmci.c\n#       modified: drivers/net/Kconfig\n#       modified: drivers/net/appletalk/cops.h\n#       modified: drivers/net/bonding/bond_main.c\n#       modified: drivers/net/sis190.c\n#       modified: drivers/net/skge.c\n#       modified: drivers/net/sky2.c\n#       modified: drivers/net/tokenring/smctr.h\n#       modified: drivers/net/wireless/atmel.c\n#       modified: drivers/net/wireless/orinoco_cs.c\n#       modified: drivers/net/wireless/wavelan_cs.c\n#       modified: drivers/parisc/ccio-dma.c\n#       modified: drivers/parisc/sba_iommu.c\n#       modified: drivers/s390/char/sclp.c\n#       modified: drivers/s390/cio/chsc.c\n#       modified: drivers/s390/cio/device.c\n#       modified: drivers/s390/cio/device_pgid.c\n#       modified: drivers/s390/cio/device_status.c\n#       modified: drivers/s390/net/lcs.c\n#       modified: drivers/s390/net/lcs.h\n#       modified: drivers/s390/net/qeth.h\n#       modified: drivers/s390/net/qeth_eddp.c\n#       modified: drivers/s390/net/qeth_main.c\n#       modified: drivers/s390/scsi/zfcp_dbf.c\n#       modified: drivers/s390/scsi/zfcp_def.h\n#       modified: drivers/s390/scsi/zfcp_erp.c\n#       modified: drivers/s390/scsi/zfcp_ext.h\n#       modified: drivers/s390/scsi/zfcp_fsf.c\n#       modified: drivers/s390/scsi/zfcp_scsi.c\n#       modified: drivers/s390/scsi/zfcp_sysfs_adapter.c\n#       modified: drivers/scsi/3w-9xxx.c\n#       modified: drivers/scsi/aacraid/aachba.c\n#       modified: drivers/scsi/aacraid/aacraid.h\n#       modified: drivers/scsi/aacraid/commctrl.c\n#       modified: drivers/scsi/aacraid/comminit.c\n#       modified: drivers/scsi/aacraid/commsup.c\n#       modified: drivers/scsi/aacraid/dpcsup.c\n#       modified: drivers/scsi/aacraid/linit.c\n#       modified: drivers/scsi/gdth.c\n#       modified: drivers/scsi/ipr.c\n#       modified: drivers/scsi/ipr.h\n#       modified: drivers/scsi/iscsi_tcp.c\n#       modified: drivers/scsi/iscsi_tcp.h\n#       modified: drivers/scsi/libata-core.c\n#       modified: drivers/scsi/megaraid.c\n#       modified: drivers/scsi/megaraid.h\n#       modified: drivers/scsi/megaraid/megaraid_sas.c\n#       modified: drivers/scsi/megaraid/megaraid_sas.h\n#       modified: drivers/scsi/qla2xxx/qla_attr.c\n#       modified: drivers/scsi/qla2xxx/qla_def.h\n#       modified: drivers/scsi/qla2xxx/qla_gbl.h\n#       modified: drivers/scsi/qla2xxx/qla_init.c\n#       modified: drivers/scsi/qla2xxx/qla_iocb.c\n#       modified: drivers/scsi/qla2xxx/qla_isr.c\n#       modified: drivers/scsi/qla2xxx/qla_mbx.c\n#       modified: drivers/scsi/qla2xxx/qla_os.c\n#       modified: drivers/scsi/qla2xxx/qla_rscn.c\n#       modified: drivers/scsi/qla2xxx/qla_sup.c\n#       modified: drivers/scsi/sata_mv.c\n#       modified: drivers/scsi/sata_vsc.c\n#       modified: drivers/scsi/scsi_lib.c\n#       modified: drivers/scsi/scsi_scan.c\n#       modified: drivers/scsi/scsi_sysfs.c\n#       modified: drivers/scsi/scsi_transport_iscsi.c\n#       modified: drivers/scsi/sym53c8xx_2/sym_hipd.c\n#       modified: drivers/serial/8250.c\n#       modified: drivers/serial/Kconfig\n#       modified: drivers/serial/ioc4_serial.c\n#       modified: drivers/usb/host/pci-quirks.c\n#       modified: drivers/usb/host/sl811_cs.c\n#       modified: drivers/usb/input/hid-core.c\n#       modified: drivers/usb/misc/Kconfig\n#       modified: drivers/usb/misc/ldusb.c\n#       modified: drivers/usb/serial/pl2303.c\n#       modified: drivers/usb/serial/pl2303.h\n#       modified: drivers/usb/storage/unusual_devs.h\n#       modified: drivers/video/Kconfig\n#       modified: drivers/video/fbmem.c\n#       modified: drivers/video/gbefb.c\n#       modified: drivers/video/neofb.c\n#       modified: drivers/video/nvidia/nvidia.c\n#       modified: drivers/video/s3c2410fb.c\n#       modified: fs/cifs/file.c\n#       modified: fs/compat.c\n#       modified: fs/exec.c\n#       modified: fs/ext2/xattr.c\n#       modified: fs/fuse/dev.c\n#       modified: fs/fuse/file.c\n#       modified: fs/jbd/checkpoint.c\n#       modified: fs/jbd/commit.c\n#       modified: fs/lockd/clntlock.c\n#       modified: fs/lockd/svc4proc.c\n#       modified: fs/lockd/svcproc.c\n#       modified: fs/ocfs2/dlm/dlmcommon.h\n#       modified: fs/ocfs2/dlm/dlmconvert.c\n#       modified: fs/ocfs2/dlm/dlmlock.c\n#       modified: fs/ocfs2/dlm/dlmmaster.c\n#       modified: fs/ocfs2/dlm/dlmrecovery.c\n#       modified: fs/ocfs2/journal.c\n#       modified: fs/ocfs2/journal.h\n#       modified: fs/reiserfs/super.c\n#       modified: fs/reiserfs/xattr_acl.c\n#       modified: fs/select.c\n#       modified: fs/stat.c\n#       modified: include/asm-alpha/mman.h\n#       new file: include/asm-arm/arch-s3c2410/h1940-latch.h\n#       modified: include/asm-arm/mman.h\n#       modified: include/asm-arm/smp.h\n#       modified: include/asm-arm/unistd.h\n#       modified: include/asm-arm26/mman.h\n#       modified: include/asm-cris/mman.h\n#       modified: include/asm-frv/atomic.h\n#       modified: include/asm-frv/cacheflush.h\n#       modified: include/asm-frv/io.h\n#       modified: include/asm-frv/mman.h\n#       modified: include/asm-frv/spr-regs.h\n#       modified: include/asm-frv/system.h\n#       modified: include/asm-frv/uaccess.h\n#       modified: include/asm-frv/unistd.h\n#       new file: include/asm-generic/mman.h\n#       modified: include/asm-h8300/mman.h\n#       modified: include/asm-i386/mman.h\n#       modified: include/asm-i386/thread_info.h\n#       modified: include/asm-i386/topology.h\n#       modified: include/asm-i386/unistd.h\n#       modified: include/asm-ia64/acpi.h\n#       modified: include/asm-ia64/machvec_sn2.h\n#       modified: include/asm-ia64/mman.h\n#       modified: include/asm-ia64/sn/arch.h\n#       modified: include/asm-ia64/sn/bte.h\n#       modified: include/asm-ia64/sn/pcibr_provider.h\n#       modified: include/asm-ia64/sn/sn_feature_sets.h\n#       modified: include/asm-ia64/sn/xpc.h\n#       modified: include/asm-ia64/timex.h\n#       modified: include/asm-m32r/mman.h\n#       modified: include/asm-m68k/mman.h\n#       modified: include/asm-mips/cpu.h\n#       deleted:  include/asm-mips/gcc/sgidefs.h\n#       modified: include/asm-mips/mach-generic/timex.h\n#       new file: include/asm-mips/mach-rm200/timex.h\n#       modified: include/asm-mips/mman.h\n#       modified: include/asm-mips/r4kcache.h\n#       modified: include/asm-mips/uaccess.h\n#       modified: include/asm-mips/unistd.h\n#       modified: include/asm-parisc/mman.h\n#       modified: include/asm-powerpc/mman.h\n#       modified: include/asm-powerpc/pgalloc.h\n#       modified: include/asm-powerpc/unistd.h\n#       modified: include/asm-s390/bitops.h\n#       modified: include/asm-s390/mman.h\n#       modified: include/asm-s390/setup.h\n#       modified: include/asm-s390/smp.h\n#       modified: include/asm-s390/unistd.h\n#       modified: include/asm-sh/mman.h\n#       modified: include/asm-sparc/mman.h\n#       modified: include/asm-sparc/unistd.h\n#       modified: include/asm-sparc64/mman.h\n#       modified: include/asm-sparc64/unistd.h\n#       modified: include/asm-v850/mman.h\n#       modified: include/asm-x86_64/hpet.h\n#       modified: include/asm-x86_64/ia32_unistd.h\n#       modified: include/asm-x86_64/mman.h\n#       modified: include/asm-x86_64/proto.h\n#       modified: include/asm-xtensa/mman.h\n#       modified: include/linux/compat.h\n#       modified: include/linux/jbd.h\n#       modified: include/linux/kernel.h\n#       modified: include/linux/ktime.h\n#       modified: include/linux/lockd/lockd.h\n#       modified: include/linux/mm.h\n#       modified: include/linux/netfilter.h\n#       modified: include/linux/netfilter_ipv4.h\n#       modified: include/linux/pci_ids.h\n#       modified: include/linux/ptrace.h\n#       modified: include/linux/sched.h\n#       modified: include/linux/syscalls.h\n#       modified: include/linux/time.h\n#       modified: include/linux/timex.h\n#       modified: include/net/bluetooth/rfcomm.h\n#       modified: include/net/ip.h\n#       modified: include/net/irda/irda.h\n#       modified: include/net/xfrm.h\n#       modified: include/scsi/iscsi_if.h\n#       modified: include/scsi/scsi.h\n#       modified: include/scsi/scsi_transport_iscsi.h\n#       modified: include/video/neomagic.h\n#       modified: kernel/cpuset.c\n#       modified: kernel/fork.c\n#       modified: kernel/hrtimer.c\n#       modified: kernel/power/snapshot.c\n#       modified: kernel/power/swsusp.c\n#       modified: kernel/ptrace.c\n#       modified: kernel/sched.c\n#       modified: kernel/sysctl.c\n#       modified: kernel/timer.c\n#       modified: lib/radix-tree.c\n#       modified: mm/hugetlb.c\n#       modified: mm/madvise.c\n#       modified: mm/memory.c\n#       modified: mm/mempolicy.c\n#       modified: mm/page_alloc.c\n#       modified: mm/swap.c\n#       modified: mm/vmscan.c\n#       modified: net/802/p8023.c\n#       modified: net/atm/signaling.c\n#       modified: net/bluetooth/hci_sock.c\n#       modified: net/bluetooth/rfcomm/core.c\n#       modified: net/bridge/br_netfilter.c\n#       modified: net/bridge/br_stp_if.c\n#       modified: net/core/datagram.c\n#       modified: net/ipv4/icmp.c\n#       modified: net/ipv4/ip_gre.c\n#       modified: net/ipv4/ip_output.c\n#       modified: net/ipv4/ipip.c\n#       modified: net/ipv4/netfilter.c\n#       modified: net/ipv4/netfilter/ip_nat_standalone.c\n#       modified: net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c\n#       modified: net/ipv4/xfrm4_output.c\n#       modified: net/ipv6/icmp.c\n#       modified: net/ipv6/netfilter/ip6t_REJECT.c\n#       modified: net/ipv6/raw.c\n#       modified: net/netfilter/Kconfig\n#       modified: net/netfilter/nf_conntrack_core.c\n#       modified: net/netfilter/nf_conntrack_proto_tcp.c\n#       modified: net/netfilter/nf_conntrack_proto_udp.c\n#       modified: net/netlink/genetlink.c\n#       modified: net/xfrm/xfrm_policy.c\n#\n#\n# Changed but not updated:\n#   (use git-update-index to mark for commit)\n#\n#       deleted:  Documentation/cpu-hotplug.txt\n#\n\n\nSpooky.  I'm seriously questioning myself whether or not I have\ndone something to this tree, but I'm 99.999% sure it's unmodified\n(by me at least).\n\ngit diff on any of the modified files shows no output, which\ncould be explained by your modified timestamp theory, but\nhow about the deleted/new files ?\n\n\t\tDave\n"},{"id":"16517","messageId":"Pine.LNX.4.64.0602211153570.30245@g5.osdl.org","threadId":"3419","inReplyTo":"20060221191948.GE22988@redhat.com","subject":"Re: merging problems with Linus' kernel tree.","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-02-21T20:03:04Z","receivedAt":"2006-02-21T20:03:04Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Tue, 21 Feb 2006, Dave Jones wrote:\n> \n> For some reason, that shows that file being deleted.\n> \n> diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt\n> deleted file mode 100644\n> index e71bc6c..0000000\n> --- a/Documentation/cpu-hotplug.txt\n> +++ /dev/null\n> @@ -1,373 +0,0 @@\n\nIf that file didn't exist in your index, \"git diff\" wouldn't even show it. \nSo it exists in your index, but not in your working tree.\n\n> Hmm, this tree is on NFS.   The server was 2-3 seconds ahead of the client\n> (for some reason ntp wasn't running), but I wouldn't expect such chaos\n> to ensue from this?\n\nNo, that won't matter. git shouldn't ever look at the current time (well, \nexcept when it creates a new commit object, of course), just the normal \nfile time, which will be determined by the server.\n\n> Hmm. git status shows a ton of modified files, that I know I've never touched.\n> (arch/frv is somewhere I'd rather not venture)\n\nSounds like you might have had a partial merge at some point that you \n^C'd or that just failed, and you did \"git reset\" on it without the \n\"--hard\" flag?\n\n> Spooky.  I'm seriously questioning myself whether or not I have\n> done something to this tree, but I'm 99.999% sure it's unmodified\n> (by me at least).\n> \n> git diff on any of the modified files shows no output, which\n> could be explained by your modified timestamp theory, but\n> how about the deleted/new files ?\n\nThose really are different in the working tree than the index (or the git \ntree: the difference between \"git diff\" and \"git diff HEAD\" - and \"git \nstatus\" does both - is obviously what you compare to).\n\nSince it's in the \"will commit\" section, it means that it's in your index \nbut not in your HEAD tree. Which in turn implies that your index seems to \nnot actually match your HEAD.\n\nThat, in turn, is usually due to an aborted merge.\n\nDo a \"git checkout -f\".\n\n\t\tLinus\n"},{"id":"16518","messageId":"20060221202935.GC24159@redhat.com","threadId":"3419","inReplyTo":"Pine.LNX.4.64.0602211153570.30245@g5.osdl.org","subject":"Re: merging problems with Linus' kernel tree.","fromName":"Dave Jones","fromEmail":"davej@redhat.com","sentAt":"2006-02-21T20:29:35Z","receivedAt":"2006-02-21T20:29:35Z","isPatch":false,"sender":{"key":"davej@redhat.com","avatar":null},"body":"On Tue, Feb 21, 2006 at 12:03:04PM -0800, Linus Torvalds wrote:\n\n > That, in turn, is usually due to an aborted merge.\n\nHmm.  (Recalls a power outage a few days ago).\nI'll bet that's when it happened.\n\n > Do a \"git checkout -f\".\n\nFixed, thanks.\n\n\t\tDave\n"}]}