From: Kukjin Kim <kgene.kim@samsung.com>
To: "'Stephen Rothwell'" <sfr@canb.auug.org.au>
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>
References: <20130619164521.f5477ccb559cc6c6f8b0a19a@canb.auug.org.au>
In-reply-to: <20130619164521.f5477ccb559cc6c6f8b0a19a@canb.auug.org.au>
Subject: RE: linux-next: manual merge of the samsung tree with the usb tree
Date: Wed, 19 Jun 2013 20:53:05 +0900
Message-id: <1f6801ce6ce3$8f1b7380$ad525a80$%kim@samsung.com>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7bit
Thread-index: Ac5suJdjhnWgqBQ1RV+QrcmQbVel8gAKtfDg
Content-language: ko
DLP-Filter: Pass
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 725
Lines: 23

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/