I must have missed the conflict on files.list, Christian. I did merge in additional files for musb that I had been working on in 14.02. It's fixed now!
Thanks for the help. Bob Sent with AquaMail for Android http://www.aqua-mail.com On June 2, 2014 10:07:00 AM Christian Helmuth <[email protected]> wrote: > Hello Bob, > > it seems you're missing some pieces of 14.05. Did you rebase your work > on top of the new release? When trying > > me@home> git blame --follow repos/dde_linux/files.list | grep xhci-pci > 5f084308 dde_linux/files.list (Sebastian Sumpf 2014-02-14 13:36:21 +0100 > 126) linux-3.9/drivers/usb/host/xhci-pci.c > > I found out, that the line you're missing was added after 14.02 but it is > part of 14.05. Maybe a merge-conflict resolution went wrong. > > Regards > -- > Christian Helmuth > Genode Labs > > http://www.genode-labs.com/ · http://genode.org/ > https://twitter.com/GenodeLabs · /ˈdʒiː.nəʊd/ > > Genode Labs GmbH · Amtsgericht Dresden · HRB 28424 · Sitz Dresden > Geschäftsführer: Dr.-Ing. Norman Feske, Christian Helmuth > > ------------------------------------------------------------------------------ > Learn Graph Databases - Download FREE O'Reilly Book > "Graph Databases" is the definitive new guide to graph databases and their > applications. Written by three acclaimed leaders in the field, this first > edition is now available. Download your free book today! > http://p.sf.net/sfu/NeoTech > _______________________________________________ > Genode-main mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/genode-main ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/NeoTech _______________________________________________ Genode-main mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/genode-main
