Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
between commit:
a2d2e593d39bc ("media: mediatek: vcodec: Drop platform_get_resource(IORESOURCE_IRQ)")
from the v4l-dvb-fixes tree and commit:
223afdf9caa07 ("media: mediatek: vcodec: Remove encoder driver get IRQ resource")
from the v4l-dvb 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/vcodec/mtk_vcodec_enc_drv.c
index d2f5f30582a9c,0abe1dac75b3a..0000000000000
--- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c
+++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc_drv.c