Merge branch 'fixes' into next
authorVinod Koul <vkoul@kernel.org>
Wed, 5 Jan 2022 07:18:05 +0000 (12:48 +0530)
committerVinod Koul <vkoul@kernel.org>
Wed, 5 Jan 2022 07:18:05 +0000 (12:48 +0530)
commit5cb664fbeba0a11592c1d2774833a4cc49d1ca19
treef5eb47d25d0b90cebbe46d0cbe33bf39bc339eef
parent105a8c525675bb7d4d64871f9b2edf39460de881
parent822c9f2b833c53fc67e8adf6f63ecc3ea24d502c
Merge branch 'fixes' into next

We have a conflict in idxd driver between 'fixes' and 'next' and there
are patches dependent on this so, merge the 'fixes' branch into next
drivers/dma/idxd/irq.c
drivers/dma/idxd/submit.c
drivers/dma/ti/k3-udma.c