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

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