linux-next: manual merge of the slave-dma-fixes tree with Linus' tree

linux-next: manual merge of the slave-dma-fixes tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

Hi all,

Today's linux-next merge of the slave-dma-fixes tree got a conflict in:

  drivers/dma/mediatek/Makefile

between commit:

  ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")

from Linus' tree and commit:

  e8b3ba1e38a2 ("dmaengine: mediatek: Add MediaTek UART APDMA support")

from the slave-dma-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/dma/mediatek/Makefile
index 13b144594510,61a6d29c8e8c..000000000000
--- a/drivers/dma/mediatek/Makefile
+++ b/drivers/dma/mediatek/Makefile
@@@ -1,3 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
+ obj-$(CONFIG_MTK_UART_APDMA) += mtk-uart-apdma.o
  obj-$(CONFIG_MTK_HSDMA) += mtk-hsdma.o
  obj-$(CONFIG_MTK_CQDMA) += mtk-cqdma.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]