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

Message-Id: <20110104160708.770eb1e2.sfr@canb.auug.org.au>
Date:	Tue, 4 Jan 2011 16:07:08 +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,
	Mac Lin <mkl0301@...il.com>,
	Anton Vorontsov <cbouatmailru@...il.com>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the usb tree with the arm tree

Hi Greg,

On Tue, 4 Jan 2011 15:58:43 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-hcd.c between commit
> 760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
> OHCI bus glue for cns3xxx SOCs") from the arm tree and various commits
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix was not quite right (I left out a "#endif") - I fixed that up.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped