linux-next: manual merge of the akpm tree with the block tree

2017-02-02 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in: fs/block_dev.c between commit: b1d2dc5659b4 ("block: Make blk_get_backing_dev_info() safe without open bdev") from the block tree and patch: "fs: add i_blocksize()" from the akpm tree. I fixed it up (see below) an

linux-next: manual merge of the akpm tree with the block tree

2015-01-20 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in mm/filemap_xip.c between commit de1414a654e6 ("fs: export inode_to_bdi and use it in favor of mapping->backing_dev_info") from the block tree and commit cd5ca6e1eb43 ("dax,ext2: replace XIP read and write with DAX I/O") from th

linux-next: manual merge of the akpm tree with the block tree

2013-04-29 Thread Stephen Rothwell
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) a

linux-next: manual merge of the akpm tree with the block tree

2013-03-25 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in block/blk-core.c between commit f79ea4161434 ("block: Refactor blk_update_request()") from the block tree and commit "block, aio: batch completion for bios/kiocbs" from the akpm tree. I fixed it up (see below) and can carry th

linux-next: manual merge of the akpm tree with the block tree

2013-03-25 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got conflicts in drivers/md/raid1.c and drivers/md/raid10.c between commit 9e882242c619 ("block: Add submit_bio_wait(), remove from md") from the block tree and commit "block: prep work for batch completion" from the akpm tree. I fixed it up (b

linux-next: manual merge of the akpm tree with the block tree

2013-03-25 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in include/linux/blk_types.h between commit a38352e0ac02 ("block: Add an explicit bio flag for bios that own their bvec") from the block tree and commit "mm: make snapshotting pages for stable writes a per-bio operation" from the

linux-next: manual merge of the akpm tree with the block tree

2013-01-15 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in fs/bio.c between commit 3a366e614d08 ("block: add missing block_bio_complete() tracepoint") from the block tree and commit "block, aio: batch completion for bios/kiocbs" from the akpm tree. I am not sure how to fix this up, so

Re: linux-next: manual merge of the akpm tree with the block tree

2013-01-15 Thread Asai Thambi S P
On 1/14/2013 9:28 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx: > Add workqueue and NUMA support") from the tree and commit "mtip32xx: > convert to batch complet

linux-next: manual merge of the akpm tree with the block tree

2013-01-13 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/block/mtip32xx/mtip32xx.c between commit 16c906e51c6f ("mtip32xx: Add workqueue and NUMA support") from the tree and commit "mtip32xx: convert to batch completion" from the akpm tree. I couldn't see how to fix up the

Re: linux-next: manual merge of the akpm tree with the block tree

2012-11-12 Thread Jens Axboe
On 2012-11-12 14:29, Andrew Morton wrote: > On Mon, 12 Nov 2012 14:20:17 -0700 > Jens Axboe wrote: > >> On 2012-11-12 14:07, Andrew Morton wrote: >>> On Mon, 12 Nov 2012 15:15:40 +1100 >>> Stephen Rothwell wrote: >>> Hi Andrew, Today's linux-next merge of the akpm tree got a confl

Re: linux-next: manual merge of the akpm tree with the block tree

2012-11-12 Thread Andrew Morton
On Mon, 12 Nov 2012 14:20:17 -0700 Jens Axboe wrote: > On 2012-11-12 14:07, Andrew Morton wrote: > > On Mon, 12 Nov 2012 15:15:40 +1100 > > Stephen Rothwell wrote: > > > >> Hi Andrew, > >> > >> Today's linux-next merge of the akpm tree got a conflict in > >> drivers/memstick/core/ms_block.h bet

Re: linux-next: manual merge of the akpm tree with the block tree

2012-11-12 Thread Jens Axboe
On 2012-11-12 14:07, Andrew Morton wrote: > On Mon, 12 Nov 2012 15:15:40 +1100 > Stephen Rothwell wrote: > >> Hi Andrew, >> >> Today's linux-next merge of the akpm tree got a conflict in >> drivers/memstick/core/ms_block.h between commit 0604fa04ccc7 ("memstick: >> add support for legacy memoryst

Re: linux-next: manual merge of the akpm tree with the block tree

2012-11-12 Thread Andrew Morton
On Mon, 12 Nov 2012 15:15:40 +1100 Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > drivers/memstick/core/ms_block.h between commit 0604fa04ccc7 ("memstick: > add support for legacy memorysticks") that use to be in the block tree > and commit

linux-next: manual merge of the akpm tree with the block tree

2012-11-11 Thread Stephen Rothwell
Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in drivers/memstick/core/ms_block.h between commit 0604fa04ccc7 ("memstick: add support for legacy memorysticks") that use to be in the block tree and commits "memstick: remove unused field from state struct", "memstick: ms_block: