* linux-next: manual merge of the samsung tree with the usb tree
@ 2013-06-19 6:45 Stephen Rothwell
2013-06-19 11:53 ` Kukjin Kim
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-06-19 6:45 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Arnd Bergmann, Greg KH, Tomasz Figa,
Kyungmin Park
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* RE: linux-next: manual merge of the samsung tree with the usb tree
2013-06-19 6:45 linux-next: manual merge of the samsung tree with the usb tree Stephen Rothwell
@ 2013-06-19 11:53 ` Kukjin Kim
0 siblings, 0 replies; 2+ messages in thread
From: Kukjin Kim @ 2013-06-19 11:53 UTC (permalink / raw)
To: 'Stephen Rothwell'
Cc: linux-next, linux-kernel, 'Arnd Bergmann',
'Greg KH', 'Tomasz Figa', 'Kyungmin Park'
Stephen Rothwell wrote:
>
> Hi Kukjin,
>
Hi,
> 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).
>
Looks good to me, thanks.
- Kukjin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-19 11:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-19 6:45 linux-next: manual merge of the samsung tree with the usb tree Stephen Rothwell
2013-06-19 11:53 ` Kukjin Kim
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).