From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vineet Gupta <Vineet.Gupta1@synopsys•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Noam Camus <noamc@ezchip•com>,
Alexey Brodkin <Alexey.Brodkin@synopsys•com>
Subject: linux-next: manual merge of the arc tree with the arc-current tree
Date: Wed, 24 Feb 2016 09:05:46 +1100 [thread overview]
Message-ID: <20160224090546.44ec25af@canb.auug.org.au> (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
reply other threads:[~2016-02-23 22:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20160224090546.44ec25af@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Alexey.Brodkin@synopsys$(echo .)com \
--cc=Vineet.Gupta1@synopsys$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=noamc@ezchip$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox