linux-next: manual merge of the arc tree with the arc-current tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the arc tree with the arc-current tree
Date	2016-02-23 23:10 +0100
Message-ID	<r5tjA-3kK-35@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Vineet,

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

  arch/arc/Kconfig

between commit:

  3e5177c1919b ("arc: get rid of DEVTMPFS dependency on INITRAMFS_SOURCE")

from the arc-current tree and commit:

  38a39d18e7b4 ("ARC: clockevent: Prepare for DT based probe")

from the arc tree.

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

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arc/Kconfig
index 8a188bc1786a,a37ab7dde4ba..000000000000
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@@ -10,8 -10,11 +10,9 @@@ config AR
  	def_bool y
  	select ARCH_SUPPORTS_ATOMIC_RMW if ARC_HAS_LLSC
  	select BUILDTIME_EXTABLE_SORT
- 	select COMMON_CLK
+ 	select CLKSRC_OF
  	select CLONE_BACKWARDS
+ 	select COMMON_CLK
 -	# ARC Busybox based initramfs absolutely relies on DEVTMPFS for /dev
 -	select DEVTMPFS if !INITRAMFS_SOURCE=""
  	select GENERIC_ATOMIC64
  	select GENERIC_CLOCKEVENTS
  	select GENERIC_FIND_FIRST_BIT

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the arc tree with the arc-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-23 23:10 +0100

csiph-web