From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756666AbZA0She (ORCPT ); Tue, 27 Jan 2009 13:37:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755489AbZA0ShY (ORCPT ); Tue, 27 Jan 2009 13:37:24 -0500 Received: from srv5.dvmed.net ([207.36.208.214]:40936 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753812AbZA0ShY (ORCPT ); Tue, 27 Jan 2009 13:37:24 -0500 Message-ID: <497F545B.6000104@garzik.org> Date: Tue, 27 Jan 2009 13:37:15 -0500 From: Jeff Garzik User-Agent: Thunderbird 2.0.0.19 (X11/20090105) MIME-Version: 1.0 To: Linus Torvalds CC: Tejun Heo , Andrew Morton , linux-ide@vger.kernel.org, LKML Subject: Re: [git patches] libata fixes References: <20090127073055.GA30360@havoc.gtf.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -4.4 (----) X-Spam-Report: SpamAssassin version 3.2.5 on srv5.dvmed.net summary: Content analysis details: (-4.4 points, 5.0 required) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds wrote: > > On Tue, 27 Jan 2009, Jeff Garzik wrote: >> Please pull from 'upstream-linus' branch of >> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus >> >> to receive the following updates: >> >> drivers/ata/Kconfig | 6 ++-- >> drivers/ata/libata-sff.c | 12 ++++++- >> drivers/ata/pata_rb532_cf.c | 2 - >> drivers/ata/pata_via.c | 22 +++++++++--- >> drivers/ata/sata_mv.c | 56 ++++++++++++++---------------- >> drivers/ata/sata_nv.c | 70 +++++++++++++++++++++++-------------- >> include/linux/pci_ids.h | 4 ++ >> 7 files changed, 104 insertions(+), 68 deletions(-) >> delete mode 100644 arch/arm/mach-integrator/clock.h > > Hmm. That delete of the empty file is "correct" (and probably came as a > result of somebody doing "make distclean" which deletes empty files), but > should not have been committed as part of "libata-sff: fix incorrect EH > message". > > Seems to be a mistake, and a small one, but still.. Be more careful. Er, oops. Sorry about that. Yeah, I habitually do 'make distclean' as part of my kclean and kbuild standard workflow scripts. I also habitually _avoid_ "git commit -a", so I am surprised that I actually made this mistake. I am 100% certain that I issued neither "git rm" nor "git update-index" commands on that file. Granted, I should have been more careful, but I am also surprised this happened at all. Jeff