linux-kernel - linux-next: manual merge of the block tree with the ide tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090609163405.69795630.sfr@canb.auug.org.au>
Date:	Tue, 9 Jun 2009 16:34:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <jens.axboe@...cle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>,
	Bartlomiej Zolnierkiewicz <bzolnier@...il.com>,
	Borislav Petkov <petkovbb@...glemail.com>,
	Mark de Wever <koraq@...all.nl>
Subject: linux-next: manual merge of the block tree with the ide tree

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).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.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. */

Content of type "application/pgp-signature" skipped