linux-kernel - linux-next: manual merge of the iommu tree with the v4l-dvb-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20230417152227.2603080-1-broonie@kernel.org>
Date:   Mon, 17 Apr 2023 16:22:27 +0100
From:   broonie@...nel.org
To:     Joerg Roedel <joro@...tes.org>
Cc:     Hans Verkuil <hverkuil-cisco@...all.nl>,
        Joerg Roedel <jroedel@...e.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>,
        Sakari Ailus <sakari.ailus@...ux.intel.com>,
        Yong Wu <yong.wu@...iatek.com>
Subject: linux-next: manual merge of the iommu tree with the v4l-dvb-next tree

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