* linux-next: manual merge of the iommu tree with the v4l-dvb-next tree
@ 2023-04-17 15:22 broonie
0 siblings, 0 replies; only message in thread
From: broonie @ 2023-04-17 15:22 UTC (permalink / raw)
To: Joerg Roedel
Cc: Hans Verkuil, Joerg Roedel, Linux Kernel Mailing List,
Linux Next Mailing List, Rob Herring, Sakari Ailus, Yong Wu
Hi all,
Today's linux-next merge of the iommu tree got conflicts in:
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
between commit:
0f4afd529224a ("media: Use of_property_present() for testing DT property presence")
from the v4l-dvb-next tree and commits:
aa0ee7b4d5221 ("media: mediatek: vcodec: Remove the setting for dma_mask")
7d35584d9c6d2 ("media: mtk-jpegdec: Remove the setting for dma_mask")
from the iommu 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.
diff --cc drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
index 6c7c5f3648df8,9b96d24363119..0000000000000
--- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c
diff --cc drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
index 9ba5dc5df648d,11583405cf618..0000000000000
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c
diff --cc drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
index 755f567b9e54f,50e5571608cdf..0000000000000
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-17 15:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-17 15:22 linux-next: manual merge of the iommu tree with the v4l-dvb-next tree broonie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).