Merge remote-tracking branch 'dmaengine/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 05:46:51 +0000 (15:46 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 05:46:51 +0000 (15:46 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 05:46:51 +0000 (15:46 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 05:46:51 +0000 (15:46 +1000)
diff --cc drivers/dma/idxd/init.c
Simple merge
diff --cc drivers/dma/xilinx/xilinx_dpdma.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 05:46:51 +0000 (15:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 05:46:51 +0000 (15:46 +1000)
		1	2
drivers/dma/idxd/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/dma/xilinx/xilinx_dpdma.c	patch \|	diff1 \|	diff2 \|	blob \| history