Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-12-14 Thread Vinod Koul
Hi Stephen, On 15-12-20, 06:58, Stephen Rothwell wrote: > Hi all, > > On Thu, 19 Nov 2020 14:29:15 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the dmaengine tree got a conflict in: > > > > drivers/dma/idxd/submit.c > > > > between commit: > > > > 8326be9f1c0b ("dm

Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-12-14 Thread Stephen Rothwell
Hi all, On Thu, 19 Nov 2020 14:29:15 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the dmaengine tree got a conflict in: > > drivers/dma/idxd/submit.c > > between commit: > > 8326be9f1c0b ("dmaengine: idxd: fix mapping of portal size") > > from the dmaengine-fixes tree an

linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-11-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the dmaengine tree got a conflict in: drivers/dma/idxd/submit.c between commit: 8326be9f1c0b ("dmaengine: idxd: fix mapping of portal size") from the dmaengine-fixes tree and commit: 8e50d392652f ("dmaengine: idxd: Add shared workqueue support") from

Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-07-05 Thread Stephen Rothwell
Hi all, On Mon, 6 Jul 2020 10:11:46 +0530 Vinod Koul wrote: > > On 05-07-20, 21:23, Dave Jiang wrote: > > > > On 7/5/2020 8:56 PM, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the dmaengine tree got a conflict in: > > > > > >drivers/dma/idxd/sysfs.c > > > > > > betwee

Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-07-05 Thread Vinod Koul
On 05-07-20, 21:23, Dave Jiang wrote: > > > On 7/5/2020 8:56 PM, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the dmaengine tree got a conflict in: > > > >drivers/dma/idxd/sysfs.c > > > > between commit: > > > >da32b28c95a7 ("dmaengine: idxd: cleanup workque

Re: linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-07-05 Thread Dave Jiang
On 7/5/2020 8:56 PM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the dmaengine tree got a conflict in: drivers/dma/idxd/sysfs.c between commit: da32b28c95a7 ("dmaengine: idxd: cleanup workqueue config after disabling") from the dmaengine-fixes tree and commit: f5

linux-next: manual merge of the dmaengine tree with the dmaengine-fixes tree

2020-07-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the dmaengine tree got a conflict in: drivers/dma/idxd/sysfs.c between commit: da32b28c95a7 ("dmaengine: idxd: cleanup workqueue config after disabling") from the dmaengine-fixes tree and commit: f50b150e315e ("dmaengine: idxd: add work queue drain su