2010-12-14 23:54:43

by Stephen Rothwell

Subject: linux-next: manual merge of the arm tree with the arm-current tree

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
from the arm-current tree and commit
4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
options are so marked") from the arm tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell [email protected]

diff --cc arch/arm/Kconfig
index d56d21c0,e77fe0f..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1310,8 -1319,8 +1319,8 @@@ config H
default 100

config THUMB2_KERNEL
- bool "Compile the kernel in Thumb-2 mode"
+ bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"
- depends on CPU_V7 && EXPERIMENTAL
+ depends on CPU_V7 && !CPU_V6 && EXPERIMENTAL
select AEABI
select ARM_ASM_UNIFIED
help

2010-12-14 23:58:07

by Russell King

Subject: Re: linux-next: manual merge of the arm tree with the arm-current tree

On Wed, Dec 15, 2010 at 10:54:35AM +1100, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
> ("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
> from the arm-current tree and commit
> 4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
> options are so marked") from the arm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Yea, rather unfortunate. I'll fix it up locally once arm-current is
merged into mainline.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:

2010-12-15 12:36:45

by Dave Martin

Subject: Re: linux-next: manual merge of the arm tree with the arm-current tree

Hi,

On Tue, Dec 14, 2010 at 11:57 PM, Russell King <[email protected]> wrote:
> On Wed, Dec 15, 2010 at 10:54:35AM +1100, Stephen Rothwell wrote:
>> Hi Russell,
>>
>> Today's linux-next merge of the arm tree got a conflict in
>> arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
>> ("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
>> from the arm-current tree and commit
>> 4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
>> options are so marked") from the arm tree.
>>
>> Just context changes. ?I fixed it up (see below) and can carry the fix as
>> necessary.
>
> Yea, rather unfortunate. ?I'll fix it up locally once arm-current is
> merged into mainline.

Looks like this was a case of two simple changes on neighbouring lines
-- I'll try to avoid such conflicts for the future.

Cheers
---Dave

2010-12-15 16:43:38

by Russell King

Subject: Re: linux-next: manual merge of the arm tree with the arm-current tree

On Wed, Dec 15, 2010 at 12:28:39PM +0000, Dave Martin wrote:
> Hi,
>
> On Tue, Dec 14, 2010 at 11:57 PM, Russell King <[email protected]> wrote:
> > On Wed, Dec 15, 2010 at 10:54:35AM +1100, Stephen Rothwell wrote:
> >> Hi Russell,
> >>
> >> Today's linux-next merge of the arm tree got a conflict in
> >> arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
> >> ("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
> >> from the arm-current tree and commit
> >> 4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
> >> options are so marked") from the arm tree.
> >>
> >> Just context changes. ?I fixed it up (see below) and can carry the fix as
> >> necessary.
> >
> > Yea, rather unfortunate. ?I'll fix it up locally once arm-current is
> > merged into mainline.
>
> Looks like this was a case of two simple changes on neighbouring lines
> -- I'll try to avoid such conflicts for the future.

It's not a problem.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: