From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail•com>
Cc: linux-next@vger•kernel.org, Borislav Petkov <petkovbb@gmail•com>,
Jerome Marchand <jmarchan@redhat•com>,
Jens Axboe <jens.axboe@oracle•com>
Subject: linux-next: manual merge of the ide tree with Linus' tree
Date: Fri, 1 May 2009 11:10:07 +1000 [thread overview]
Message-ID: <20090501111007.83f1db68.sfr@canb.auug.org.au> (raw)
Hi Bartlomiej,
Today's linux-next merge of the ide tree got a conflict in
include/linux/blkdev.h between commit
42dad7647aec49b3ad20dd0cb832b232a6ae514f ("block: simplify I/O stat
accounting") from Linus' tree and commit
96c16743973e8c1a7b9c655d10b7973408d6d1dd ("ide-cd: fix REQ_QUIET tests in
cdrom_decode_status") from the ide tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/blkdev.h
index 2755d5c,6f841fb..0000000
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -600,7 -598,7 +600,8 @@@ enum
blk_failfast_transport(rq) || \
blk_failfast_driver(rq))
#define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED)
+ #define blk_rq_quiet(rq) ((rq)->cmd_flags & REQ_QUIET)
+#define blk_rq_io_stat(rq) ((rq)->cmd_flags & REQ_IO_STAT)
#define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq)))
reply other threads:[~2009-05-01 1:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090501111007.83f1db68.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bzolnier@gmail$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=jmarchan@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=petkovbb@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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