On Mon, Feb 03, 2014 at 08:35:06PM +0200, Aaro Koskinen wrote: > Hi, > > On Wed, Dec 04, 2013 at 03:29:53PM -0800, Greg Kroah-Hartman wrote: > > On Tue, Dec 03, 2013 at 11:46:50AM -0800, David Daney wrote: > > > From: David Daney <david.daney@xxxxxxxxxx> > > > > > > Tested against both EdgeRouter LITE (no bootloader supplied device > > > tree), and ebb5610 (device tree supplied by bootloader). > > > > > > The patch set is spread across both the MIPS and staging trees, so it > > > would be great if Ralf could merge at least the MIPS parts, if not > > > both parts. > > > > That's fine with me: > > > > Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > It seems only the MIPS part was merged, and as a result the OCTEON > USB build is now broken in 3.14-rc1. > > Would it be possible to merge the missing part through the staging > tree? The original is here: http://patchwork.linux-mips.org/patch/6186/ > The below one is rebased for 3.14-rc1 and tested on EdgeRouter Lite. Sure, I can queue it up for 3.14, and will do so in a few days. thanks, greg k-h
