* linux-next: manual merge of the rockchip tree with the arm-soc tree
@ 2016-11-21 23:19 Stephen Rothwell
2016-11-21 23:38 ` Olof Johansson
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2016-11-21 23:19 UTC (permalink / raw)
To: Heiko Stuebner, Olof Johansson, Arnd Bergmann, ARM
Cc: linux-next, linux-kernel, Neil Armstrong, Kevin Hilman, Andy Yan
Hi Heiko,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs")
from the arm-soc tree and commit:
5295a3157348 ("arm64: defconfig: enable RK808 components")
from the rockchip 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 2640e193a8c4,731cc6ade789..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -297,23 -293,10 +299,24 @@@ CONFIG_REGULATOR_MAX77620=
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_SMD_RPM=y
CONFIG_REGULATOR_QCOM_SPMI=y
+ CONFIG_REGULATOR_RK808=y
CONFIG_REGULATOR_S2MPS11=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+# CONFIG_DVB_NET is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_RENESAS_FCP=m
+CONFIG_VIDEO_RENESAS_VSP1=m
CONFIG_DRM=m
CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_RCAR_DU=m
+CONFIG_DRM_RCAR_HDMI=y
+CONFIG_DRM_RCAR_LVDS=y
+CONFIG_DRM_RCAR_VSP=y
CONFIG_DRM_TEGRA=m
CONFIG_DRM_PANEL_SIMPLE=m
CONFIG_DRM_I2C_ADV7511=m
@@@ -408,7 -393,7 +414,8 @@@ CONFIG_XEN_GRANT_DEV_ALLOC=
CONFIG_COMMON_CLK_SCPI=y
CONFIG_COMMON_CLK_CS2000_CP=y
CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_COMMON_CLK_PWM=y
+ CONFIG_COMMON_CLK_RK808=y
CONFIG_CLK_QORIQ=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_MSM_GCC_8916=y
@@@ -423,13 -406,13 +430,15 @@@ CONFIG_ARM_SMMU=
CONFIG_QCOM_SMEM=y
CONFIG_QCOM_SMD=y
CONFIG_QCOM_SMD_RPM=y
+ CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_TEGRA_210_SOC=y
+CONFIG_ARCH_TEGRA_186_SOC=y
CONFIG_EXTCON_USB_GPIO=y
CONFIG_PWM=y
+ CONFIG_PWM_ROCKCHIP=y
CONFIG_PWM_TEGRA=m
+CONFIG_PWM_MESON=m
CONFIG_COMMON_RESET_HI6220=y
CONFIG_PHY_RCAR_GEN3_USB2=y
CONFIG_PHY_HI6220_USB=y
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the rockchip tree with the arm-soc tree
2016-11-21 23:19 linux-next: manual merge of the rockchip tree with the arm-soc tree Stephen Rothwell
@ 2016-11-21 23:38 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2016-11-21 23:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Heiko Stuebner, Arnd Bergmann, ARM, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, Neil Armstrong, Kevin Hilman,
Andy Yan
Hi,
On Mon, Nov 21, 2016 at 3:19 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Heiko,
>
> Today's linux-next merge of the rockchip tree got a conflict in:
>
> arch/arm64/configs/defconfig
>
> between commit:
>
> a59294b2f7c7 ("ARM64: defconfig: Enable MMC related configs")
>
> from the arm-soc tree and commit:
>
> 5295a3157348 ("arm64: defconfig: enable RK808 components")
>
> from the rockchip 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.
This sounds fine, and it's a conflict we'll resolve when we merge this
material from Heiko.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the rockchip tree with the arm-soc tree
@ 2025-09-15 17:21 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2025-09-15 17:21 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Arnd Bergmann, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 941 bytes --]
Hi all,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
between commit:
090be83a07923 ("Merge branch 'soc/dt' into for-next")
from the arm-soc tree and commit:
3f20580e1daba ("Merge branch 'v6.18-armsoc/dts64' into for-next")
from the rockchip 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 arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
index c1763835f53d4,e907e279bc98a..0000000000000
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the rockchip tree with the arm-soc tree
@ 2025-09-22 9:08 Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2025-09-22 9:08 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Andy Yan, Linux Kernel Mailing List, Linux Next Mailing List,
Nicolas Frattaroli
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
Hi all,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
between commit:
07c53a9e97071 ("arm64: dts: rockchip: Enable DP2HDMI for ROCK 5 ITX")
from the arm-soc tree and commit:
dcc6785caffad ("arm64: dts: rockchip: fix second M.2 slot on ROCK 5T")
from the rockchip 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 arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
index c1763835f53d4,a0c2b575f588f..0000000000000
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-09-22 9:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-21 23:19 linux-next: manual merge of the rockchip tree with the arm-soc tree Stephen Rothwell
2016-11-21 23:38 ` Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2025-09-15 17:21 Mark Brown
2025-09-22 9:08 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox