From: Borislav Petkov <petkovbb@googlemail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <jens.axboe@oracle.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>,
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
Borislav Petkov <petkovbb@googlemail.com>,
Mark de Wever <koraq@xs4all.nl>
Subject: Re: linux-next: manual merge of the block tree with the ide tree
Date: Tue, 9 Jun 2009 09:57:06 +0200 [thread overview]
Message-ID: <20090609075706.GA6878@liondog.tnic> (raw)
In-Reply-To: <20090609163405.69795630.sfr@canb.auug.org.au>
On Tue, Jun 09, 2009 at 04:34:05PM +1000, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> drivers/ide/ide-tape.c between various commits from the ide tree and
> various commits from the block tree.
>
> I fixed it up as best I could (see below).
Yep, looks good. Thanks.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/ide/ide-tape.c
> index 51ea59e,683ff37..0000000
> --- a/drivers/ide/ide-tape.c
> +++ b/drivers/ide/ide-tape.c
> @@@ -610,8 -617,8 +628,8 @@@ static ide_startstop_t idetape_do_reque
> struct ide_cmd cmd;
> u8 stat;
>
> - debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %lu\n",
> - (unsigned long long)rq->sector, rq->nr_sectors);
> - 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))) {
> /* We do not support buffer cache originated requests. */
--
Regards/Gruss,
Boris.
next prev parent reply other threads:[~2009-06-09 7:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 6:34 linux-next: manual merge of the block tree with the ide tree Stephen Rothwell
2009-06-09 7:57 ` Borislav Petkov [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 5:09 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090609075706.GA6878@liondog.tnic \
--to=petkovbb@googlemail.com \
--cc=bzolnier@gmail.com \
--cc=jens.axboe@oracle.com \
--cc=koraq@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox