* linux-next: manual merge of the samsung-krzk tree with the keystone tree
@ 2017-12-03 22:45 Stephen Rothwell
2017-12-21 23:05 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2017-12-03 22:45 UTC (permalink / raw)
To: Krzysztof Kozlowski, Santosh Shilimkar
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Marek Szyprowski
Hi Krzysztof,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
f15187dcdbcd ("ARM: config: sync multi-v7 config with keystone peripherals")
from the keystone tree and commit:
453c63073185 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Exynos boards")
from the samsung-krzk 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/arm/configs/multi_v7_defconfig
index 6f2343e259f7,833892568d31..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -558,7 -583,8 +559,9 @@@ CONFIG_VIDEO_STI_DELTA=
CONFIG_VIDEO_RENESAS_JPU=m
CONFIG_VIDEO_RENESAS_VSP1=m
CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIVID=m
+ CONFIG_CEC_PLATFORM_DRIVERS=y
+ CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_ADV7180=m
CONFIG_VIDEO_ML86V7667=m
@@@ -582,16 -613,12 +585,17 @@@ CONFIG_DRM_RCAR_DU=
CONFIG_DRM_RCAR_LVDS=y
CONFIG_DRM_SUN4I=m
CONFIG_DRM_TEGRA=y
+CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
-CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_DUMB_VGA_DAC=m
+CONFIG_DRM_NXP_PTN3460=m
+CONFIG_DRM_PARADE_PS8622=m
+CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
+ CONFIG_DRM_SII9234=m
CONFIG_DRM_STI=m
-CONFIG_DRM_VC4=y
+CONFIG_DRM_VC4=m
CONFIG_FB_ARMCLCD=y
CONFIG_FB_EFI=y
CONFIG_FB_WM8505=y
@@@ -626,9 -655,10 +630,10 @@@ CONFIG_SND_SOC_SAMSUNG=
CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
CONFIG_SND_SOC_SMDK_WM8994_PCM=m
CONFIG_SND_SOC_SNOW=m
+ CONFIG_SND_SOC_ODROID=m
CONFIG_SND_SOC_SH4_FSI=m
CONFIG_SND_SOC_RCAR=m
-CONFIG_SND_SIMPLE_SCU_CARD=m
+CONFIG_SND_SOC_STI=m
CONFIG_SND_SUN4I_CODEC=m
CONFIG_SND_SOC_TEGRA=m
CONFIG_SND_SOC_TEGRA20_I2S=m
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the samsung-krzk tree with the keystone tree
2017-12-03 22:45 linux-next: manual merge of the samsung-krzk tree with the keystone tree Stephen Rothwell
@ 2017-12-21 23:05 ` Stephen Rothwell
2017-12-22 8:40 ` Krzysztof Kozlowski
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2017-12-21 23:05 UTC (permalink / raw)
To: Santosh Shilimkar, Olof Johansson, Arnd Bergmann, ARM
Cc: Krzysztof Kozlowski, Linux-Next Mailing List,
Linux Kernel Mailing List, Marek Szyprowski
Hi all,
On Mon, 4 Dec 2017 09:45:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm/configs/multi_v7_defconfig
>
> between commit:
>
> f15187dcdbcd ("ARM: config: sync multi-v7 config with keystone peripherals")
>
> from the keystone tree and commit:
>
> 453c63073185 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Exynos boards")
>
> from the samsung-krzk 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/arm/configs/multi_v7_defconfig
> index 6f2343e259f7,833892568d31..000000000000
> --- a/arch/arm/configs/multi_v7_defconfig
> +++ b/arch/arm/configs/multi_v7_defconfig
> @@@ -558,7 -583,8 +559,9 @@@ CONFIG_VIDEO_STI_DELTA=
> CONFIG_VIDEO_RENESAS_JPU=m
> CONFIG_VIDEO_RENESAS_VSP1=m
> CONFIG_V4L_TEST_DRIVERS=y
> +CONFIG_VIDEO_VIVID=m
> + CONFIG_CEC_PLATFORM_DRIVERS=y
> + CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
> # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
> CONFIG_VIDEO_ADV7180=m
> CONFIG_VIDEO_ML86V7667=m
> @@@ -582,16 -613,12 +585,17 @@@ CONFIG_DRM_RCAR_DU=
> CONFIG_DRM_RCAR_LVDS=y
> CONFIG_DRM_SUN4I=m
> CONFIG_DRM_TEGRA=y
> +CONFIG_DRM_PANEL_SIMPLE=y
> CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
> CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
> -CONFIG_DRM_PANEL_SIMPLE=y
> +CONFIG_DRM_DUMB_VGA_DAC=m
> +CONFIG_DRM_NXP_PTN3460=m
> +CONFIG_DRM_PARADE_PS8622=m
> +CONFIG_DRM_I2C_ADV7511=m
> +CONFIG_DRM_I2C_ADV7511_AUDIO=y
> + CONFIG_DRM_SII9234=m
> CONFIG_DRM_STI=m
> -CONFIG_DRM_VC4=y
> +CONFIG_DRM_VC4=m
> CONFIG_FB_ARMCLCD=y
> CONFIG_FB_EFI=y
> CONFIG_FB_WM8505=y
> @@@ -626,9 -655,10 +630,10 @@@ CONFIG_SND_SOC_SAMSUNG=
> CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
> CONFIG_SND_SOC_SMDK_WM8994_PCM=m
> CONFIG_SND_SOC_SNOW=m
> + CONFIG_SND_SOC_ODROID=m
> CONFIG_SND_SOC_SH4_FSI=m
> CONFIG_SND_SOC_RCAR=m
> -CONFIG_SND_SIMPLE_SCU_CARD=m
> +CONFIG_SND_SOC_STI=m
> CONFIG_SND_SUN4I_CODEC=m
> CONFIG_SND_SOC_TEGRA=m
> CONFIG_SND_SOC_TEGRA20_I2S=m
This is now a conflict between the arm-soc and keystone trees (I think).
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the samsung-krzk tree with the keystone tree
2017-12-21 23:05 ` Stephen Rothwell
@ 2017-12-22 8:40 ` Krzysztof Kozlowski
0 siblings, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2017-12-22 8:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Santosh Shilimkar, Olof Johansson, Arnd Bergmann, ARM,
Linux-Next Mailing List, Linux Kernel Mailing List,
Marek Szyprowski
On Fri, Dec 22, 2017 at 12:05 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Mon, 4 Dec 2017 09:45:58 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>>
>> arch/arm/configs/multi_v7_defconfig
>>
>> between commit:
>>
>> f15187dcdbcd ("ARM: config: sync multi-v7 config with keystone peripherals")
>>
>> from the keystone tree and commit:
>>
>> 453c63073185 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Exynos boards")
>>
>> from the samsung-krzk 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/arm/configs/multi_v7_defconfig
>> index 6f2343e259f7,833892568d31..000000000000
>> --- a/arch/arm/configs/multi_v7_defconfig
>> +++ b/arch/arm/configs/multi_v7_defconfig
>> @@@ -558,7 -583,8 +559,9 @@@ CONFIG_VIDEO_STI_DELTA=
>> CONFIG_VIDEO_RENESAS_JPU=m
>> CONFIG_VIDEO_RENESAS_VSP1=m
>> CONFIG_V4L_TEST_DRIVERS=y
>> +CONFIG_VIDEO_VIVID=m
>> + CONFIG_CEC_PLATFORM_DRIVERS=y
>> + CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
>> # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
>> CONFIG_VIDEO_ADV7180=m
>> CONFIG_VIDEO_ML86V7667=m
>> @@@ -582,16 -613,12 +585,17 @@@ CONFIG_DRM_RCAR_DU=
>> CONFIG_DRM_RCAR_LVDS=y
>> CONFIG_DRM_SUN4I=m
>> CONFIG_DRM_TEGRA=y
>> +CONFIG_DRM_PANEL_SIMPLE=y
>> CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
>> CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
>> -CONFIG_DRM_PANEL_SIMPLE=y
>> +CONFIG_DRM_DUMB_VGA_DAC=m
>> +CONFIG_DRM_NXP_PTN3460=m
>> +CONFIG_DRM_PARADE_PS8622=m
>> +CONFIG_DRM_I2C_ADV7511=m
>> +CONFIG_DRM_I2C_ADV7511_AUDIO=y
>> + CONFIG_DRM_SII9234=m
>> CONFIG_DRM_STI=m
>> -CONFIG_DRM_VC4=y
>> +CONFIG_DRM_VC4=m
>> CONFIG_FB_ARMCLCD=y
>> CONFIG_FB_EFI=y
>> CONFIG_FB_WM8505=y
>> @@@ -626,9 -655,10 +630,10 @@@ CONFIG_SND_SOC_SAMSUNG=
>> CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
>> CONFIG_SND_SOC_SMDK_WM8994_PCM=m
>> CONFIG_SND_SOC_SNOW=m
>> + CONFIG_SND_SOC_ODROID=m
>> CONFIG_SND_SOC_SH4_FSI=m
>> CONFIG_SND_SOC_RCAR=m
>> -CONFIG_SND_SIMPLE_SCU_CARD=m
>> +CONFIG_SND_SOC_STI=m
>> CONFIG_SND_SUN4I_CODEC=m
>> CONFIG_SND_SOC_TEGRA=m
>> CONFIG_SND_SOC_TEGRA20_I2S=m
>
> This is now a conflict between the arm-soc and keystone trees (I think).
Yes, my pull request ended in arm-soc so the same resolution of yours applies.
Thanks!
Krzysztof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-22 8:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-03 22:45 linux-next: manual merge of the samsung-krzk tree with the keystone tree Stephen Rothwell
2017-12-21 23:05 ` Stephen Rothwell
2017-12-22 8:40 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).