From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>, Greg KH <greg@kroah.com>,
Tomasz Figa <t.figa@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>
Subject: linux-next: manual merge of the samsung tree with the usb tree
Date: Wed, 19 Jun 2013 16:45:21 +1000 [thread overview]
Message-ID: <20130619164521.f5477ccb559cc6c6f8b0a19a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
drivers/usb/Kconfig between commit d9ea21a77927 ("usb: host: make
USB_ARCH_HAS_?HCI obsolete") from the usb tree and commit 58d5b72088cc
("USB: Check for ARCH_EXYNOS separately") from the samsung tree.
I fixed it up (USB_ARCH_HAS_EHCI is no longer used) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-06-19 6:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 6:45 Stephen Rothwell [this message]
2013-06-19 11:53 ` Kukjin Kim
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=20130619164521.f5477ccb559cc6c6f8b0a19a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=t.figa@samsung.com \
/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
all inboxes | Powered by JetHome®