From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Bolle <pebolle@tiscali.nl>, Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the usb tree with the arm-soc tree
Date: Mon, 3 Mar 2014 18:13:37 +1100 [thread overview]
Message-ID: <20140303181337.186b799feeb9ca132a7579a1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 984 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-tegra/Kconfig between commit ddb902cc3459 ("ARM: centralize
common multi-platform kconfig options") from the arm-soc tree and commit
f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI") from the
usb tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-tegra/Kconfig
index f61cd5b9f103,4926bd11f190..000000000000
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -12,9 -18,10 +12,8 @@@ config ARCH_TEGR
select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER
select SOC_BUS
- select USB_ARCH_HAS_EHCI if USB_SUPPORT
- select SPARSE_IRQ
select USB_ULPI if USB_PHY
select USB_ULPI_VIEWPORT if USB_PHY
- select USE_OF
help
This enables support for NVIDIA Tegra based systems.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-03-03 7:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 7:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-17 4:43 linux-next: manual merge of the usb tree with the arm-soc tree Stephen Rothwell
2021-06-17 16:34 ` Matthias Kaehlcke
2021-06-17 17:30 ` Bjorn Andersson
2021-06-18 6:35 ` Greg KH
2014-07-24 6:28 Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:42 ` Greg KH
2014-07-24 15:39 ` Olof Johansson
2011-10-04 5:50 Stephen Rothwell
2011-10-04 15:26 ` Greg KH
2011-10-05 8:52 ` Felipe Balbi
2011-10-05 10:51 ` Stephen Rothwell
2011-10-05 10:53 ` Felipe Balbi
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=20140303181337.186b799feeb9ca132a7579a1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=pebolle@tiscali.nl \
--cc=robh@kernel.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).