From: Jeff Garzik Date: Thu, 09 Jun 2005 06:54:37 GMT Subject: git bug? Message-ID: <42A7E7AD.5030108@pobox.com> Just upgraded to the latest git, pulled the latest Linux kernel tree, and made a local modification. Here is the strange git-diff-cache output: > [jgarzik@pretzel libata-dev]$ git-diff-cache -p HEAD > diff --git a/arch/arm/mm/minicache.c b/arch/arm/mm/minicache.c > deleted file mode 100644 > diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c > --- a/drivers/scsi/libata-core.c > +++ b/drivers/scsi/libata-core.c > @@ -3059,8 +3059,6 @@ static void __ata_qc_complete(struct ata > struct ata_port *ap = qc->ap; > unsigned int tag, do_clear = 0; > > - WARN_ON(!assert_spin_locked(&ap->host_set->lock)); > - > if (likely(qc->flags & ATA_QCFLAG_ACTIVE)) { > assert(ap->queue_depth); > ap->queue_depth--; The libata-core part is correct, the arch/arm/mm part is not. I pulled using unmodified, upstream git scripts. No sugar added. Here's what the repo looks like: > [jgarzik@pretzel libata-dev]$ git-rev-list --pretty HEAD ^master | git-shortlog > Jeff Garzik: > Merge /spare/repo/linux-2.6/ > Automatic merge of /spare/repo/linux-2.6/.git branch HEAD > > Jens Axboe: > libata: fix spinlock bug introduced by NCQ code > libata: ncq support update > libata-scsi: better placement of cmd completion on err > SATA NCQ support It's mirroring to kernel.org right now, at rsync.kernel.org://...jgarzik/libata-dev.git if somebody wants to poke at it. Top of tree is d032ec9048ff82a704b96b93cfd6f2e8e3a06b19 (when fully uploaded and mirrored). Jeff