]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit78dda5cfee59edc5cf86febe1643509c796a8b4e
treeb6a29560e6364bd98634564181cab54a3b6164a4
parent62d3350e25ae7ab14b519579a0bee0f045af5ac9
parentfef6deec30a9d2ca0115c4b29db4cbe42dfe2e32
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