Hi Jens,
Today's linux-next merge of the block tree got a conflict in
include/linux/blkdev.h between commit 336b7e1f2309 ("block: remove
export for blk_queue_bio") from Linus' tree and commit d40f75a06dd6
("writeback, blkcg: restructure blk_{set|clear}_queue_congested()")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc include/linux/blkdev.h
index 5d93a6645e88,31cd832cebb7..000000000000
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -821,25 -787,8 +787,6 @@@ extern int scsi_cmd_ioctl(struct reques
extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
struct scsi_ioctl_command __user *);
- /*
- * A queue has just exitted congestion. Note this in the global counter of
- * congested queues, and wake up anyone who was waiting for requests to be
- * put back.
- */
- static inline void blk_clear_queue_congested(struct request_queue *q, int
sync)
- {
- clear_bdi_congested(&q->backing_dev_info, sync);
- }
-
- /*
- * A queue has just entered congestion. Flag that in the queue's VM-visible
- * state flags and increment the global gounter of congested queues.
- */
- static inline void blk_set_queue_congested(struct request_queue *q, int sync)
- {
- set_bdi_congested(&q->backing_dev_info, sync);
- }
-extern void blk_queue_bio(struct request_queue *q, struct bio *bio);
--
extern void blk_start_queue(struct request_queue *q);
extern void blk_stop_queue(struct request_queue *q);
extern void blk_sync_queue(struct request_queue *q);
pgpoLKcEzX8Aw.pgp
Description: OpenPGP digital signature
