From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: git bug? Date: Thu, 09 Jun 2005 02:54:37 -0400 Message-ID: <42A7E7AD.5030108@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-From: git-owner@vger.kernel.org Thu Jun 09 08:53:03 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DgGse-0000a3-KR for gcvg-git@gmane.org; Thu, 09 Jun 2005 08:51:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262297AbVFIGzE (ORCPT ); Thu, 9 Jun 2005 02:55:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262289AbVFIGzE (ORCPT ); Thu, 9 Jun 2005 02:55:04 -0400 Received: from mail.dvmed.net ([216.237.124.58]:38612 "EHLO mail.dvmed.net") by vger.kernel.org with ESMTP id S262300AbVFIGys (ORCPT ); Thu, 9 Jun 2005 02:54:48 -0400 Received: from cpe-065-184-065-144.nc.res.rr.com ([65.184.65.144] helo=[10.10.10.88]) by mail.dvmed.net with esmtpsa (Exim 4.51 #1 (Red Hat Linux)) id 1DgGw9-0004Z5-Nu for git@vger.kernel.org; Thu, 09 Jun 2005 06:54:47 +0000 User-Agent: Mozilla Thunderbird 1.0.2-6 (X11/20050513) X-Accept-Language: en-us, en To: Git Mailing List X-Spam-Score: 0.0 (/) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org 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