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

[Dave Jiang]

On 7/27/2021 6:44 AM, Vinod Koul wrote:
> On 23-07-21, 11:16, Uwe Kleine-König wrote:
> > Hello,
> >
> > On Fri, Jul 23, 2021 at 03:53:54PM +1000, 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:
> > >
> > >    fc7a6209d571 ("bus: Make remove callback return void")
> > >
> > > from the driver-core tree and commit:
> > >
> > >    d9e5481fca74 ("dmaengine: dsa: move dsa_bus_type out of idxd driver to standalone")
> > >
> > > from the dmaengine tree.
> > Greg provided a tag for this case at
> >
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/bus_remove_return_void-5.15
> >
> > . Vinod might want to rebase on top of this or merge it into his tree
> > with Stephen's conflict resolution.
> Thanks I have merged the tag and resolved conflict as above.
>
> Dave pls test

Tested. Looks good. Thx.


>