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  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]
Date:	Thu, 12 Nov 2009 08:52:54 +1100
From:	Stephen Rothwell <>
To:	Tony Lindgren <>
Cc:	Greg KH <>,,,
	Felipe Balbi <>,
Subject: Re: linux-next: manual merge of the usb tree with the omap tree

Hi Tony,

On Wed, 11 Nov 2009 11:20:59 -0800 Tony Lindgren <> wrote:
> * Tony Lindgren <> [091111 11:12]:
> > 
> > Oops, sorry. Looks like I accidentally included also drivers/usb/host/ehci-omap.c
> > as we were testing it in the linux-omap tree.
> > 
> > I'll drop the drivers/usb/host/ehci-omap.c part from my queue, it should get
> > integrated via Greg's queue. I'll just merge the platform init code.
> Dropped anything touching drivers/usb from my patch. So no need for Greg
> to do anything, the updated version of the patch below for reference.

OK, thanks.  Just as long as we don't forget the necessary updates when
these are all integrated into Linus' tree.  Some conflicts in linux-next
are not a bad thing for that reason.

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists