2013-06-19 06:45:31

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the samsung tree with the usb tree

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 [email protected]

Attachments:
(No filename) (460.00 B)
 (No filename) (836.00 B)
 Download all attachments

2013-06-19 11:53:09

by Kukjin Kim

[permalink] [raw]
Subject: RE: linux-next: manual merge of the samsung tree with the usb tree

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