projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5aeba4 3c21964)
Merge tag 'dmaengine_topic_slave_id_removal_5.17' into next
authorVinod Koul <vkoul@kernel.org>
Fri, 17 Dec 2021 16:12:17 +0000 (21:42 +0530)
committerVinod Koul <vkoul@kernel.org>
Fri, 17 Dec 2021 16:12:17 +0000 (21:42 +0530)
Merge the tag dmaengine_topic_slave_id_removal_5.17 into next. This
brings in the slave_id removal topic changes

1  2 
drivers/dma/sh/shdma-base.c patch | diff1 | diff2 | blob | history
include/linux/dmaengine.h patch | diff1 | diff2 | blob | history

diff --cc drivers/dma/sh/shdma-base.c
Simple merge
diff --cc include/linux/dmaengine.h
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git