linux-kernel - RE: linux-next: manual merge of the samsung tree with the usb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-id: <1f6801ce6ce3$8f1b7380$ad525a80$%kim@samsung.com>
Date:	Wed, 19 Jun 2013 20:53:05 +0900
From:	Kukjin Kim <kgene.kim@...sung.com>
To:	'Stephen Rothwell' <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'Arnd Bergmann' <arnd@...db.de>, 'Greg KH' <greg@...ah.com>,
	'Tomasz Figa' <t.figa@...sung.com>,
	'Kyungmin Park' <kyungmin.park@...sung.com>
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

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