Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754060Ab3JYNDu (ORCPT ); Fri, 25 Oct 2013 09:03:50 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:47230 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753084Ab3JYNDs (ORCPT ); Fri, 25 Oct 2013 09:03:48 -0400 From: Thierry Reding To: Will Deacon , Russell King , Mark Salter Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the c6x tree Date: Fri, 25 Oct 2013 15:03:39 +0200 Message-Id: <1382706224-8859-1-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1382632289-18523-1-git-send-email-treding@nvidia.com> References: <1382632289-18523-1-git-send-email-treding@nvidia.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1039 Lines: 31 Today's linux-next merge of the c6x tree got a conflict in arch/arm/Kconfig caused by commits 148104c (ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64) and commit d701884 (arm: select ARCH_MIGHT_HAVE_PC_PARPORT). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/arm/Kconfig index c06647d,7db8abe0..b6a708e --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -5,7 -5,7 +5,8 @@@ config AR select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAVE_CUSTOM_GPIO_H + select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_WANT_IPC_PARSE_VERSION select BUILDTIME_EXTABLE_SORT if MMU select CLONE_BACKWARDS -- 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/