linux-next: manual merge of the omap tree with the arm-soc tree

linux-next: manual merge of the omap tree with the arm-soc tree

[Stephen Rothwell]

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

Hi all,

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

  arch/arm/mach-omap1/Kconfig

between commit:

  67d3928c3df5 ("ARM: omap1: remove unused board files")

from the arm-soc tree and commit:

  609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")

from the omap 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/mach-omap1/Kconfig
index 8df9a4de0e79,f833526aa7cd..000000000000
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@@ -118,8 -165,33 +118,8 @@@ config MACH_OMAP_OS
  	depends on ARCH_OMAP16XX
  	help
  	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
-           if you have such a board.
+ 	  if you have such a board.
  
 -config OMAP_OSK_MISTRAL
 -	bool "Mistral QVGA board Support"
 -	depends on MACH_OMAP_OSK
 -	depends on UNUSED_BOARD_FILES
 -	help
 -	  The OSK supports an optional add-on board with a Quarter-VGA
 -	  touchscreen, PDA-ish buttons, a resume button, bicolor LED,
 -	  and camera connector.  Say Y here if you have this board.
 -
 -config MACH_OMAP_PERSEUS2
 -	bool "TI Perseus2"
 -	depends on ARCH_OMAP730
 -	depends on UNUSED_BOARD_FILES
 -	help
 -	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
 -	  a board.
 -
 -config MACH_OMAP_FSAMPLE
 -	bool "TI F-Sample"
 -	depends on ARCH_OMAP730
 -	depends on UNUSED_BOARD_FILES
 -	help
 -	  Support for TI OMAP 850 F-Sample board. Say Y here if you have such
 -	  a board.
 -
  config MACH_OMAP_PALMTE
  	bool "Palm Tungsten E"
  	depends on ARCH_OMAP15XX

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

Re: linux-next: manual merge of the omap tree with the arm-soc tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [230109 22:57]:
> Hi all,
> 
> Today's linux-next merge of the omap tree got a conflict in:
> 
>   arch/arm/mach-omap1/Kconfig
> 
> between commit:
> 
>   67d3928c3df5 ("ARM: omap1: remove unused board files")
> 
> from the arm-soc tree and commit:
> 
>   609c1fabc7c5 ("ARM: omap1: Kconfig: Fix indentation")
> 
> from the omap tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, I just dropped "ARM: omap1: remove unused board files" to
simplify things.

Juerg, care to update and resend in a few weeks after v6.3-rc1
after the omap1 clean-up patches are merged?

Regards,

Tony

[PATCH v2] ARM: omap1: Kconfig: Fix indentation

[Juerg Haefliger]

The convention for indentation seems to be a single tab. Help text is
further indented by an additional two whitespaces. Fix the lines that
violate these rules.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>

---
v2: Updated for latest upstream.

---
 arch/arm/mach-omap1/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 8df9a4de0e79..cbf703f0d850 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -118,7 +118,7 @@ config MACH_OMAP_OSK
 	depends on ARCH_OMAP16XX
 	help
 	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
-          if you have such a board.
+	  if you have such a board.
 
 config MACH_OMAP_PALMTE
 	bool "Palm Tungsten E"
-- 
2.34.1

Re: [PATCH v2] ARM: omap1: Kconfig: Fix indentation

[Tony Lindgren]

* Juerg Haefliger <juerg.haefliger@canonical.com> [230315 11:12]:
> The convention for indentation seems to be a single tab. Help text is
> further indented by an additional two whitespaces. Fix the lines that
> violate these rules.
> 
> Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> 
> ---
> v2: Updated for latest upstream.

Thans for updating it, applying into omap-for-v6.4/omap1.

Regards,

Tony

Re: linux-next: manual merge of the omap tree with the arm-soc tree

[Tony Lindgren]

* Olof Johansson <olof@lixom.net> [150120 10:27]:
> On Tue, Jan 20, 2015 at 9:10 AM, Tony Lindgren <tony@atomide.com> wrote:
> > * Stephen Rothwell <sfr@canb.auug.org.au> [150119 16:12]:
> >> Hi Tony,
> >>
> >> Today's linux-next merge of the omap tree got a conflict in
> >> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
> >> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
> >> tree and commit ac7452cee743 ("ARM: dts: Add minimal support for
> >> dm8168-evm") from the omap tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Uhh why is cb612390e546 doing formatting changes all over the place?
> > That's a sure way to produce merge conflicts..
> 
> It's intentional but a but annoying, yes -- we're resolving them as we
> merge in new DT contents so it won't be exposed outside of our tree
> (and -next, unfortunately).

OK. I don't have anything against cleaning up and sorting things to
avoid merge conflicts naturally :)

Maybe for other similar changes you can set up an immutable branch
abainst v3.xx-rc1 with just the clean-up that people can use as
a base without having to bring in all the other changes?

Regards,

Tony

Re: linux-next: manual merge of the omap tree with the arm-soc tree

[Olof Johansson]

On Tue, Jan 20, 2015 at 9:10 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> [150119 16:12]:
>> Hi Tony,
>>
>> Today's linux-next merge of the omap tree got a conflict in
>> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
>> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
>> tree and commit ac7452cee743 ("ARM: dts: Add minimal support for
>> dm8168-evm") from the omap tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Uhh why is cb612390e546 doing formatting changes all over the place?
> That's a sure way to produce merge conflicts..

It's intentional but a but annoying, yes -- we're resolving them as we
merge in new DT contents so it won't be exposed outside of our tree
(and -next, unfortunately).


-Olof

Re: linux-next: manual merge of the omap tree with the arm-soc tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [150119 16:12]:
> Hi Tony,
> 
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
> build dtb if associated Arch and/or SoC is enabled") from the arm-soc
> tree and commit ac7452cee743 ("ARM: dts: Add minimal support for
> dm8168-evm") from the omap tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Uhh why is cb612390e546 doing formatting changes all over the place?
That's a sure way to produce merge conflicts..

Anyways the conflict resolution looks good to me thanks.

Regards,

Tony
 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/boot/dts/Makefile
> index a240d2d07b38,a6ace4d57ea5..000000000000
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@@ -392,8 -348,8 +392,9 @@@ dtb-$(CONFIG_ARCH_OMAP3) += 
>   	omap3-sbc-t3730.dtb \
>   	omap3-thunder.dtb \
>   	omap3-zoom3.dtb
> + dtb-$(CONFIG_SOC_TI81XX) += dm8168-evm.dtb
>  -dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
>  +dtb-$(CONFIG_SOC_AM33XX) += \
>  +	am335x-base0033.dtb \
>   	am335x-bone.dtb \
>   	am335x-boneblack.dtb \
>   	am335x-evm.dtb \
> @@@ -410,20 -365,17 +411,21 @@@ dtb-$(CONFIG_ARCH_OMAP4) += 
>   	omap4-sdp-es23plus.dtb \
>   	omap4-var-dvk-om44.dtb \
>   	omap4-var-stk-om44.dtb
>  -dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
>  +dtb-$(CONFIG_SOC_AM43XX) += \
>  +	am43x-epos-evm.dtb \
>   	am437x-sk-evm.dtb \
> + 	am437x-idk-evm.dtb \
>   	am437x-gp-evm.dtb
>  -dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
>  +dtb-$(CONFIG_SOC_OMAP5) += \
>  +	omap5-cm-t54.dtb \
>   	omap5-sbc-t54.dtb \
>   	omap5-uevm.dtb
>  -dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
>  +dtb-$(CONFIG_SOC_DRA7XX) += \
>  +	dra7-evm.dtb \
>   	am57xx-beagle-x15.dtb \
>   	dra72-evm.dtb
>  -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
>  +dtb-$(CONFIG_ARCH_ORION5X) += \
>  +	orion5x-lacie-d2-network.dtb \
>   	orion5x-lacie-ethernet-disk-mini-v2.dtb \
>   	orion5x-maxtor-shared-storage-2.dtb \
>   	orion5x-rd88f5182-nas.dtb

linux-next: manual merge of the omap tree with the arm-soc tree

[Stephen Rothwell]

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

Hi Tony,

Today's linux-next merge of the omap tree got a conflict in
arch/arm/boot/dts/Makefile between commit cb612390e546 ("ARM: dts: Only
build dtb if associated Arch and/or SoC is enabled") from the arm-soc
tree and commit ac7452cee743 ("ARM: dts: Add minimal support for
dm8168-evm") from the omap tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/boot/dts/Makefile
index a240d2d07b38,a6ace4d57ea5..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -392,8 -348,8 +392,9 @@@ dtb-$(CONFIG_ARCH_OMAP3) += 
  	omap3-sbc-t3730.dtb \
  	omap3-thunder.dtb \
  	omap3-zoom3.dtb
+ dtb-$(CONFIG_SOC_TI81XX) += dm8168-evm.dtb
 -dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
 +dtb-$(CONFIG_SOC_AM33XX) += \
 +	am335x-base0033.dtb \
  	am335x-bone.dtb \
  	am335x-boneblack.dtb \
  	am335x-evm.dtb \
@@@ -410,20 -365,17 +411,21 @@@ dtb-$(CONFIG_ARCH_OMAP4) += 
  	omap4-sdp-es23plus.dtb \
  	omap4-var-dvk-om44.dtb \
  	omap4-var-stk-om44.dtb
 -dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
 +dtb-$(CONFIG_SOC_AM43XX) += \
 +	am43x-epos-evm.dtb \
  	am437x-sk-evm.dtb \
+ 	am437x-idk-evm.dtb \
  	am437x-gp-evm.dtb
 -dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
 +dtb-$(CONFIG_SOC_OMAP5) += \
 +	omap5-cm-t54.dtb \
  	omap5-sbc-t54.dtb \
  	omap5-uevm.dtb
 -dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
 +dtb-$(CONFIG_SOC_DRA7XX) += \
 +	dra7-evm.dtb \
  	am57xx-beagle-x15.dtb \
  	dra72-evm.dtb
 -dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
 +dtb-$(CONFIG_ARCH_ORION5X) += \
 +	orion5x-lacie-d2-network.dtb \
  	orion5x-lacie-ethernet-disk-mini-v2.dtb \
  	orion5x-maxtor-shared-storage-2.dtb \
  	orion5x-rd88f5182-nas.dtb

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]