Re: linux-next: manual merge of the drm-misc tree with Linus' tree

["Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>]

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

On Wed, Sep 13, 2023 at 11:09:39AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/mediatek/mtk_dpi.c
> 
> between commits:
> 
>   47d4bb6bbcdb ("drm/mediatek: mtk_dpi: Simplify with devm_drm_bridge_add()")
>   90c95c3892dd ("drm/mediatek: mtk_dpi: Switch to .remove_new() void callback")
> 
> from Linus' tree and commit:
> 
>   c04ca6bbb7ea ("drm/mediatek: Convert to platform remove callback returning void")
> 
> from the drm-misc tree.
> 
> I fixed it up (the latter is the same as 90c95c3892dd)

That's not entirely true:

uwe@taurus:~/gsrc/linux$ git show --oneline --stat 90c95c3892dd
90c95c3892dd drm/mediatek: mtk_dpi: Switch to .remove_new() void callback
 drivers/gpu/drm/mediatek/mtk_dpi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
uwe@taurus:~/gsrc/linux$ git show --oneline --stat c04ca6bbb7ea
c04ca6bbb7ea drm/mediatek: Convert to platform remove callback returning void
 drivers/gpu/drm/mediatek/mtk_disp_aal.c   | 6 ++----
 drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 6 ++----
 drivers/gpu/drm/mediatek/mtk_disp_color.c | 6 ++----
 drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 6 ++----
 drivers/gpu/drm/mediatek/mtk_disp_merge.c | 6 ++----
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c   | 6 ++----
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c  | 6 ++----
 drivers/gpu/drm/mediatek/mtk_dp.c         | 6 ++----
 drivers/gpu/drm/mediatek/mtk_dpi.c        | 6 ++----
 drivers/gpu/drm/mediatek/mtk_drm_drv.c    | 6 ++----
 drivers/gpu/drm/mediatek/mtk_dsi.c        | 6 ++----
 drivers/gpu/drm/mediatek/mtk_hdmi.c       | 5 ++---
 drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c   | 6 ++----
 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c   | 5 ++---
 14 files changed, 28 insertions(+), 54 deletions(-)

But yes, restricted to drivers/gpu/drm/mediatek/mtk_dpi.c the patches do
the same (but have a different base, so there is some fuzz):

$ diff -u <(git show c04ca6bbb7ea drivers/gpu/drm/mediatek/mtk_dpi.c ) <(git show 90c95c3892dd)
--- /dev/fd/63	2023-09-13 10:22:37.368055450 +0200
+++ /dev/fd/62	2023-09-13 10:22:37.372055516 +0200
@@ -1,46 +1,36 @@
-commit c04ca6bbb7ea6ea7cba9ba8d3d4d4c767008d189
-Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Date:   Sun May 7 18:25:52 2023 +0200
+commit 90c95c3892dde019182ceac984d4ca1f3c85844b
+Author: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Date:   Wed Jul 26 10:22:43 2023 +0200

[...]

 diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
-index 28bdb1f427ff..0ef722c24150 100644
+index e9c5a0f44537..3a140498c98a 100644
 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
 +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
-@@ -1101,14 +1101,12 @@ static int mtk_dpi_probe(struct platform_device *pdev)
+@@ -1087,11 +1087,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)
  	return 0;
  }

 -static int mtk_dpi_remove(struct platform_device *pdev)
 +static void mtk_dpi_remove(struct platform_device *pdev)
  {
- 	struct mtk_dpi *dpi = platform_get_drvdata(pdev);
-
  	component_del(&pdev->dev, &mtk_dpi_component_ops);
- 	drm_bridge_remove(&dpi->bridge);
 -
 -	return 0;
  }

  static const struct of_device_id mtk_dpi_of_ids[] = {
-@@ -1139,7 +1137,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);
+@@ -1122,7 +1120,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);

  struct platform_driver mtk_dpi_driver = {
  	.probe = mtk_dpi_probe,


e44dd16393896b2545a6d57b2c11381fe7628aa0 looks right.

Best regards and thanks,
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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