linux-next: manual merge of the renesas tree with the imx-mxs and qcom trees

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the renesas tree got a conflict in:

  arch/arm64/configs/defconfig

between commits:

  3fbd82f9af29 ("arm64: defconfig: run through savedefconfig for ordering")
  60f84e65da59 ("arm64: defconfig: Enable NXP flexcan driver")
  d0a9e6319257 ("arm64: defconfig: Enable Truly NT35597 WQXGA panel")

from the imx-mxs and qcom trees and commit:

  bf9e333ec0d5 ("arm64: defconfig: Enable additional support for Renesas platforms")

from the renesas 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.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/configs/defconfig
index ff4bee8c3158,49053323323f..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -164,7 -162,8 +164,9 @@@ CONFIG_QRTR_SMD=
  CONFIG_QRTR_TUN=m
  CONFIG_BPF_JIT=y
  CONFIG_CAN=m
 +CONFIG_CAN_FLEXCAN=m
+ CONFIG_CAN_RCAR=m
+ CONFIG_CAN_RCAR_CANFD=m
  CONFIG_BT=m
  CONFIG_BT_HIDP=m
  # CONFIG_BT_HS is not set
@@@ -568,11 -535,13 +575,14 @@@ CONFIG_V4L_MEM2MEM_DRIVERS=
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
  CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+ CONFIG_VIDEO_RENESAS_FDP1=m
  CONFIG_VIDEO_RENESAS_FCP=m
  CONFIG_VIDEO_RENESAS_VSP1=m
+ CONFIG_SDR_PLATFORM_DRIVERS=y
+ CONFIG_VIDEO_RCAR_DRIF=m
  CONFIG_DRM=m
  CONFIG_DRM_I2C_NXP_TDA998X=m
 +CONFIG_DRM_MALI_DISPLAY=m
  CONFIG_DRM_NOUVEAU=m
  CONFIG_DRM_EXYNOS=m
  CONFIG_DRM_EXYNOS5433_DECON=y
@@@ -588,17 -557,21 +598,23 @@@ CONFIG_ROCKCHIP_DW_HDMI=
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_RCAR_DU=m
+ CONFIG_DRM_RCAR_DW_HDMI=m
  CONFIG_DRM_SUN4I=m
 +CONFIG_DRM_SUN6I_DSI=m
  CONFIG_DRM_SUN8I_DW_HDMI=m
  CONFIG_DRM_SUN8I_MIXER=m
  CONFIG_DRM_MSM=m
  CONFIG_DRM_TEGRA=m
+ CONFIG_DRM_PANEL_LVDS=m
  CONFIG_DRM_PANEL_SIMPLE=m
 +CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
+ CONFIG_DRM_DUMB_VGA_DAC=m
  CONFIG_DRM_SII902X=m
+ CONFIG_DRM_THINE_THC63LVD1024=m
  CONFIG_DRM_TI_SN65DSI86=m
  CONFIG_DRM_I2C_ADV7511=m
+ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+ CONFIG_DRM_DW_HDMI_CEC=m
  CONFIG_DRM_VC4=m
  CONFIG_DRM_ETNAVIV=m
  CONFIG_DRM_HISI_HIBMC=m
@@@ -759,7 -728,9 +776,8 @@@ CONFIG_COMMON_CLK_RK808=
  CONFIG_COMMON_CLK_SCPI=y
  CONFIG_COMMON_CLK_CS2000_CP=y
  CONFIG_COMMON_CLK_S2MPS11=y
 -CONFIG_CLK_QORIQ=y
  CONFIG_COMMON_CLK_PWM=y
+ CONFIG_COMMON_CLK_VC5=y
  CONFIG_CLK_RASPBERRYPI=m
  CONFIG_CLK_IMX8MM=y
  CONFIG_CLK_IMX8MN=y
@@@ -843,8 -808,10 +861,9 @@@ CONFIG_ARCH_K3_J721E_SOC=
  CONFIG_TI_SCI_PM_DOMAINS=y
  CONFIG_EXTCON_USB_GPIO=y
  CONFIG_EXTCON_USBC_CROS_EC=y
 -CONFIG_MEMORY=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
+ CONFIG_MAX9611=m
  CONFIG_QCOM_SPMI_ADC5=m
  CONFIG_ROCKCHIP_SARADC=m
  CONFIG_IIO_CROS_EC_SENSORS_CORE=m
@@@ -938,12 -900,12 +957,13 @@@ CONFIG_NLS_ISO8859_1=
  CONFIG_SECURITY=y
  CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
 +CONFIG_CRYPTO_USER_API_RNG=m
  CONFIG_CRYPTO_DEV_SUN8I_CE=m
  CONFIG_CRYPTO_DEV_FSL_CAAM=m
 -CONFIG_CRYPTO_DEV_HISI_ZIP=m
 -CONFIG_CRYPTO_USER_API_RNG=m
 +CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m
  CONFIG_CRYPTO_DEV_QCOM_RNG=m
 +CONFIG_CRYPTO_DEV_HISI_ZIP=m
+ CONFIG_CRYPTO_DEV_CCREE=m
  CONFIG_CMA_SIZE_MBYTES=32
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_INFO=y

Attachment: pgpgGTfCrgBe2.pgp
Description: OpenPGP digital signature