From: Mark Brown <broonie@kernel•org>
To: Greg KH <greg@kroah•com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>,
Kishon Vijay Abraham I <kishon@ti•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the usb tree with the tree
Date: Wed, 12 Mar 2014 01:05:25 +0000 [thread overview]
Message-ID: <20140312010525.b04a12173c7778df42da7a31@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in arch/arm/mach-tegra/Kconfig between commit 06c886a95cbb533 ("phy: mvebu-sata: prepare new Dove DT Kconfig variable") from the USB tree and commit ff1f0018cf66 ("drivers: Enable building of Kirkwood drivers for mach-mvebu") from the mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
diff --cc drivers/phy/Kconfig
index 05711ea4fd15,8d3c49cc500f..000000000000
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -24,7 -27,7 +27,7 @@@ config PHY_EXYNOS_MIPI_VIDE
config PHY_MVEBU_SATA
def_bool y
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || MACH_DOVE
depends on OF
select GENERIC_PHY
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-12 1:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 1:05 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-03-12 1:18 linux-next: manual merge of the usb tree with the tree Mark Brown
2013-10-28 12:01 Stephen Rothwell
2013-10-31 22:16 ` Greg KH
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=20140312010525.b04a12173c7778df42da7a31@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=kishon@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sebastian.hesselbarth@gmail$(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