Skip to contentSkip to conversation

linux-next: manual merge of the drm-tegra tree with the drm tree

PATCH [email protected] 2 participants 2 messages Feb 23, 2022 – Feb 28, 2022

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the drm-tegra tree got conflicts in:

drivers/gpu/drm/tegra/dpaux.c
drivers/gpu/drm/tegra/Kconfig

between commit:

adb9d5a2cc77e ("drm/dp: Move DisplayPort helpers into separate helper module")

from the drm tree and commit:

8913e1aea4b32 ("drm/tegra: dpaux: Populate AUX bus")

from the drm-tegra 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.

drivers/gpu/drm/tegra/Kconfig +0 -0
diff --cc drivers/gpu/drm/tegra/Kconfig
index 18c319b804c00,201f5175ecfec..0000000000000
@@@ -5,7 -5,7 +5,8 @@@ config DRM_TEGR
  	depends on COMMON_CLK
  	depends on DRM
  	depends on OF
 +	select DRM_DP_HELPER
+ 	select DRM_DP_AUX_BUS
  	select DRM_KMS_HELPER
  	select DRM_MIPI_DSI
  	select DRM_PANEL
drivers/gpu/drm/tegra/dpaux.c +0 -0
diff --cc drivers/gpu/drm/tegra/dpaux.c
index 8ca500977a46b,d7a731d287d23..0000000000000
@@@ -18,7 -18,8 +18,8 @@@
  #include <linux/reset.h>
  #include <linux/workqueue.h>
  
 -#include <drm/drm_dp_helper.h>
 -#include <drm/drm_dp_aux_bus.h>
 +#include <drm/dp/drm_dp_helper.h>
++#include <drm/dp/drm_dp_aux_bus.h>
  #include <drm/drm_panel.h>
  
  #include "dp.h"
#1 lore raw

Hi all,

Quoted 41 lines · On Wed, 23 Feb 2022 16:30:07 +0000 [email protected] wrote:

Today's linux-next merge of the drm-tegra tree got conflicts in:

drivers/gpu/drm/tegra/dpaux.c
drivers/gpu/drm/tegra/Kconfig

between commit:

adb9d5a2cc77e ("drm/dp: Move DisplayPort helpers into separate helper module")

from the drm tree and commit:

8913e1aea4b32 ("drm/tegra: dpaux: Populate AUX bus")

from the drm-tegra 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.

drivers/gpu/drm/tegra/Kconfig +1 -0
diff --cc drivers/gpu/drm/tegra/Kconfig
index 18c319b804c00,201f5175ecfec..0000000000000
@@@ -5,7 -5,7 +5,8 @@@ config DRM_TEGR
  	depends on COMMON_CLK
  	depends on DRM
  	depends on OF
 +	select DRM_DP_HELPER
+ 	select DRM_DP_AUX_BUS
  	select DRM_KMS_HELPER
  	select DRM_MIPI_DSI
  	select DRM_PANEL
drivers/gpu/drm/tegra/dpaux.c +0 -0
diff --cc drivers/gpu/drm/tegra/dpaux.c
index 8ca500977a46b,d7a731d287d23..0000000000000

drivers/gpu/drm/tegra/dpaux.c

Quoted 10 lines
drivers/gpu/drm/tegra/dpaux.c +1 -0
@@@ -18,7 -18,8 +18,8 @@@
  #include <linux/reset.h>
  #include <linux/workqueue.h>
 
 -#include <drm/drm_dp_helper.h>
 -#include <drm/drm_dp_aux_bus.h>
 +#include <drm/dp/drm_dp_helper.h>
++#include <drm/dp/drm_dp_aux_bus.h>
  #include <drm/drm_panel.h>
 
  #include "dp.h"

This is now a conflict between the drm tree and Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell