From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: Re: [git pull] IDE fixes Date: Sat, 16 May 2009 21:33:45 +0200 Message-ID: <200905162133.46010.bzolnier@gmail.com> References: <200905162116.23690.bzolnier@gmail.com> <20090516192219.GA6202@liondog.tnic> Mime-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from ey-out-2122.google.com ([74.125.78.26]:5738 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752611AbZEPT3c (ORCPT ); Sat, 16 May 2009 15:29:32 -0400 In-Reply-To: <20090516192219.GA6202@liondog.tnic> Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Borislav Petkov Cc: Linus Torvalds , Andrew Morton , Stephen Rothwell , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org On Saturday 16 May 2009 21:22:19 Borislav Petkov wrote: > Hi, > > On Sat, May 16, 2009 at 09:16:23PM +0200, Bartlomiej Zolnierkiewicz wrote: > > > > ide-tape oops fix, icside regression fix and new piix cable quirk > > > > Linus, please pull from 'for-linus' branch of: > > > > master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git for-linus > > > > to receive the following updates: > > > > drivers/ide/icside.c | 2 +- > > drivers/ide/ide-tape.c | 6 ------ > > drivers/ide/piix.c | 1 + > > 3 files changed, 2 insertions(+), 7 deletions(-) > > > > > > Alan Cox (1): > > piix: The Sony TZ90 needs the cable type hardcoding > > > > Sergei Shtylyov (1): > > icside: register second channel of version 6 PCB > > > > Tejun Heo (1): > > ide-tape: remove back-to-back REQUEST_SENSE detection > > I assume it is too late to add another ide-tape debug build fix I told > you about earlier today: No its too early -- this patch doesn't even apply to Linus' tree. [ It applies on top of all 2.6.31 block+ide changes... ] > -- > From: Mark de Wever > Date: Sat, 16 May 2009 18:17:30 +0200 > Subject: [PATCH] ide-tape: fix debug call > > This error only occurs when IDETAPE_DEBUG_LOG is enabled. > > Signed-off-by: Mark de Wever > --- > drivers/ide/ide-tape.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c > index 9ca2665..521a5f5 100644 > --- a/drivers/ide/ide-tape.c > +++ b/drivers/ide/ide-tape.c > @@ -592,7 +592,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive, > struct ide_cmd cmd; > u8 stat; > > - debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n" > + debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n", > (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq)); > > if (!(blk_special_request(rq) || blk_sense_request(rq))) { > -- > 1.6.3 > > If so, you could still queue it for 30-rc7 if there would be one... > > Thanks.