linux-kernel - linux-next: manual merge of the akpm tree with the block 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>] [day] [month] [year] [list]

Message-Id: <20130430160258.fb07daf91f2542552d5cde6d@canb.auug.org.au>
Date:	Tue, 30 Apr 2013 16:02:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Asai Thambi S P <asamymuthupa@...ron.com>,
	Sam Bradshaw <sbradshaw@...ron.com>,
	Jens Axboe <axboe@...nel.dk>,
	Kent Overstreet <koverstreet@...gle.com>
Subject: linux-next: manual merge of the akpm tree with the block tree

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@...b.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);
  }

Content of type "application/pgp-signature" skipped