Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/block/mtip32xx/mtip32xx.c between commit 2077d947260c ("mtip32xx:
Workaround for unaligned writes") from the block tree and commit
"mtip32xx: convert to batch completion" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/block/mtip32xx/mtip32xx.c
index 847107e,4b9603e..0000000
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@@ -2561,8 -2574,8 +2577,8 @@@ static int mtip_hw_ioctl(struct driver_
   *	None
   */
  static void mtip_hw_submit_io(struct driver_data *dd, sector_t sector,
- 			      int nsect, int nents, int tag, void *callback,
- 			      void *data, int dir, int unaligned)
+ 			      int nsect, int nents, int tag,
 -			      struct bio *bio, int dir)
++			      struct bio *bio, int dir, int unaligned)
  {
  	struct host_to_dev_fis	*fis;
  	struct mtip_port *port = dd->port;
@@@ -3934,10 -3911,8 +3945,9 @@@ static void mtip_make_request(struct re
  				bio_sectors(bio),
  				nents,
  				tag,
- 				bio_endio,
  				bio,
 -				bio_data_dir(bio));
 +				bio_data_dir(bio),
 +				unaligned);
  	} else
  		bio_io_error(bio);
  }