From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 block/ll_rw_blk.c      |    8 --------
 block/scsi_ioctl.c     |    4 ----
 drivers/cdrom/cdrom.c  |    4 ----
 include/linux/blkdev.h |    5 -----
 4 files changed, 21 deletions(-)

diff -puN block/ll_rw_blk.c~revert-git-block block/ll_rw_blk.c
--- a/block/ll_rw_blk.c~revert-git-block
+++ a/block/ll_rw_blk.c
@@ -2515,21 +2515,13 @@ EXPORT_SYMBOL(blk_rq_map_user_iov);
 
 /**
  * blk_rq_unmap_user - unmap a request with user data
-<<<<<<< HEAD/block/ll_rw_blk.c
  * @rq:		rq to be unmapped
-=======
- * @bio:	bio to be unmapped
->>>>>>> /block/ll_rw_blk.c
  *
  * Description:
  *    Unmap a rq previously mapped by blk_rq_map_user().
  *    rq->bio must be set to the original head of the request.
  */
-<<<<<<< HEAD/block/ll_rw_blk.c
 int blk_rq_unmap_user(struct request *rq)
-=======
-int blk_rq_unmap_user(struct bio *bio)
->>>>>>> /block/ll_rw_blk.c
 {
 	struct bio *bio, *mapped_bio;
 
diff -puN block/scsi_ioctl.c~revert-git-block block/scsi_ioctl.c
--- a/block/scsi_ioctl.c~revert-git-block
+++ a/block/scsi_ioctl.c
@@ -338,11 +338,7 @@ static int sg_io(struct file *file, requ
 			hdr->sb_len_wr = len;
 	}
 
-<<<<<<< HEAD/block/scsi_ioctl.c
 	if (blk_rq_unmap_user(rq))
-=======
-	if (blk_rq_unmap_user(bio))
->>>>>>> /block/scsi_ioctl.c
 		ret = -EFAULT;
 
 	/* may not have succeeded, but output values written to control
diff -puN drivers/cdrom/cdrom.c~revert-git-block drivers/cdrom/cdrom.c
--- a/drivers/cdrom/cdrom.c~revert-git-block
+++ a/drivers/cdrom/cdrom.c
@@ -2139,12 +2139,8 @@ static int cdrom_read_cdda_bpc(struct cd
 			cdi->last_sense = s->sense_key;
 		}
 
-<<<<<<< HEAD/drivers/cdrom/cdrom.c
 		rq->bio = bio;
 		if (blk_rq_unmap_user(rq))
-=======
-		if (blk_rq_unmap_user(bio))
->>>>>>> /drivers/cdrom/cdrom.c
 			ret = -EFAULT;
 
 		if (ret)
diff -puN include/linux/blkdev.h~revert-git-block include/linux/blkdev.h
--- a/include/linux/blkdev.h~revert-git-block
+++ a/include/linux/blkdev.h
@@ -678,13 +678,8 @@ extern void __blk_stop_queue(request_que
 extern void blk_run_queue(request_queue_t *);
 extern void blk_start_queueing(request_queue_t *);
 extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *);
-<<<<<<< HEAD/include/linux/blkdev.h
 extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long);
 extern int blk_rq_unmap_user(struct request *);
-=======
-extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned int);
-extern int blk_rq_unmap_user(struct bio *);
->>>>>>> /include/linux/blkdev.h
 extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t);
 extern int blk_rq_map_user_iov(request_queue_t *, struct request *,
 			       struct sg_iovec *, int, unsigned int);
_