Merge branch 'for-linus' into fixes
authorVinod Koul <vkoul@kernel.org>
Wed, 5 Aug 2020 13:32:07 +0000 (19:02 +0530)
committerVinod Koul <vkoul@kernel.org>
Wed, 5 Aug 2020 13:32:07 +0000 (19:02 +0530)
commit0b5ad7b9522e6172342511fac6114fd8b7eb622a
treeb6a29560e6364bd98634564181cab54a3b6164a4
parent87730ccbddcb48478b1b88e88b14e73424130764
parent6bd0dffa1a6e19e73964ae47c964f57c625cce05
Merge branch 'for-linus' into fixes

Signed-off-by: Vinod Koul <vkoul@kernel.org>
 Conflicts:
drivers/dma/idxd/sysfs.c
12 files changed:
drivers/dma/dmatest.c
drivers/dma/dw/core.c
drivers/dma/idxd/cdev.c
drivers/dma/idxd/device.c
drivers/dma/idxd/idxd.h
drivers/dma/idxd/irq.c
drivers/dma/idxd/sysfs.c
drivers/dma/imx-sdma.c
drivers/dma/ioat/dma.c
drivers/dma/ti/k3-udma-private.c
drivers/dma/ti/k3-udma.c
include/uapi/linux/idxd.h