linux-kernel - linux-next: manual merge of the usb tree with the usb.current 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-next>] [day] [month] [year] [list]

Message-ID: <20141105151825.26c53948@canb.auug.org.au>
Date:	Wed, 5 Nov 2014 15:18:25 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paul Bolle <pebolle@...cali.nl>,
	Sylwester Nawrocki <s.nawrocki@...sung.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
references to non-existent PLAT_S5P symbol") from the usb.current tree
and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
PLAT_S5P") from the usb tree.

I fixed it up (I used the usb tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped