From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Peter Robinson <pbrobinson@gmail.com>,
Olof Johansson <olof@lixom.net>,
linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the omap tree with the arm-soc tree
Date: Tue, 20 Jan 2015 09:10:49 -0800 [thread overview]
Message-ID: <20150120171048.GF7718@atomide.com> (raw)
In-Reply-To: <20150120110947.1a92a416@canb.auug.org.au>
* 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
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the omap tree with the arm-soc tree
Date: Tue, 20 Jan 2015 09:10:49 -0800 [thread overview]
Message-ID: <20150120171048.GF7718@atomide.com> (raw)
In-Reply-To: <20150120110947.1a92a416@canb.auug.org.au>
* 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 at 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
WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Peter Robinson <pbrobinson@gmail.com>
Subject: Re: linux-next: manual merge of the omap tree with the arm-soc tree
Date: Tue, 20 Jan 2015 09:10:49 -0800 [thread overview]
Message-ID: <20150120171048.GF7718@atomide.com> (raw)
In-Reply-To: <20150120110947.1a92a416@canb.auug.org.au>
* 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
next prev parent reply other threads:[~2015-01-20 17:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 0:09 linux-next: manual merge of the omap tree with the arm-soc tree Stephen Rothwell
2015-01-20 0:09 ` Stephen Rothwell
2015-01-20 0:09 ` Stephen Rothwell
2015-01-20 17:10 ` Tony Lindgren [this message]
2015-01-20 17:10 ` Tony Lindgren
2015-01-20 17:10 ` Tony Lindgren
2015-01-20 18:24 ` Olof Johansson
2015-01-20 18:24 ` Olof Johansson
2015-01-20 18:40 ` Tony Lindgren
2015-01-20 18:40 ` Tony Lindgren
2015-01-20 18:40 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2023-01-09 22:50 Stephen Rothwell
2023-01-09 22:50 ` Stephen Rothwell
2023-01-19 10:11 ` Tony Lindgren
2023-01-19 10:11 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150120171048.GF7718@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=pbrobinson@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.