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: <20121114150746.433de520ffbc71b4281f3c62@canb.auug.org.au>
Date:	Wed, 14 Nov 2012 15:07:46 +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,
	Florian Fainelli <florian@...nwrt.org>
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 conflicts in
drivers/usb/host/ehci-ls1x.c and drivers/usb/host/ohci-xls.c between
commit e592c5d0b7db ("Revert "USB/host: Cleanup unneccessary irq disable
code"") from the usb.current tree and commits ead92fae1290 ("USB: EHCI:
remove Loongson 1B EHCI driver") and c2e91e046df6 ("USB: OHCI: remove
Netlogic XLS OHCI platform driver") from the usb tree.

The latter removed the files, so I just did that 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