From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the renesas tree with the arm-soc tree
Date: Thu, 25 Feb 2016 09:07:02 +1100 [thread overview]
Message-ID: <20160225090702.6f090bcf@canb.auug.org.au> (raw)
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
from the arm-soc tree and commit:
a9c42f02387c ("arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support")
from the renesas tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index 7fddb2188f5c,eaf738a59927..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -230,7 -213,7 +230,8 @@@ CONFIG_QCOM_SMD_RPM=
CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_TEGRA_210_SOC=y
CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_PHY_RCAR_GEN3_USB2=y
CONFIG_PHY_XGENE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
next reply other threads:[~2016-02-24 22:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 22:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-02 11:21 linux-next: manual merge of the renesas tree with the arm-soc tree Mark Brown
2015-12-02 11:35 ` Arnd Bergmann
2015-07-26 23:32 Stephen Rothwell
2015-07-26 23:27 Stephen Rothwell
2015-01-15 0:38 Stephen Rothwell
2015-01-15 8:44 ` Geert Uytterhoeven
2014-05-22 2:12 Stephen Rothwell
2013-12-15 23:47 Stephen Rothwell
2013-12-16 10:00 ` Nicolas Ferre
2013-12-17 0:19 ` Simon Horman
2014-01-04 5:11 ` Olof Johansson
2014-01-04 11:43 ` Stephen Rothwell
2014-01-05 5:54 ` Simon Horman
2014-01-06 9:44 ` Nicolas Ferre
2014-01-08 16:56 ` Mike Turquette
2013-04-19 6:59 Stephen Rothwell
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=20160225090702.6f090bcf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).