Messages in this thread | | | Date | Wed, 15 Dec 2010 12:28:39 +0000 | Subject | Re: linux-next: manual merge of the arm tree with the arm-current tree | From | Dave Martin <> |
| |
Hi,
On Tue, Dec 14, 2010 at 11:57 PM, Russell King <rmk@arm.linux.org.uk> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |