On Thu, Sep 22, 2011 at 08:58:53PM +0200, Marc Dietrich wrote: > Greg, > > On Thursday 22 September 2011 20:13:13 Greg KH wrote: > > On Thu, Sep 22, 2011 at 08:10:06PM +0200, Marc Dietrich wrote: > > > > I'll take this, and any other cleanup patch that is sent to me, you > > > > need to be able to handle merges with stuff like that. > > > > > > I fear you can't because it's not based on the version in your tree. > > > Btw, is there some "current" version of the staging tree available > > > (not kernel.org), like on github as some other kernel dev did? I'm > > > not sure against which tree I can rebase the patches. > > > > No, there's no public tree at the moment, I recommend just going off of > > the linux-next tree as that had the previous version already > > incorporated in it before kernel.org went down. > > > > If there are differences from that one to my current one that conflict > > with anything you send me, I'll let you know. > > I just checked linux-next and it misses nearly all of the patches I sent > back in August and I'm sure you had them in your staging tree. Only the > first out of 8 are applied > (http://driverdev.linuxdriverproject.org/pipermail/devel/2011- > August/019664.html). > > The reason for this may be that yet another nvec cleanup patch was applied > to linux-next via the kernel mailing list > (https://lkml.org/lkml/2011/7/15/129, > 88d94e301e416f672b2991af3404aebfb6277b2c in linux-next) instead of going > through linux driver project ML (or notify the driver author) and the > staging tree, which made the 2nd patch of my series fail to merge... > > Grrr, so how to proceed now? As far as I can see, we have two options: > - wait for staging to come back > - rebase against linux-next (including the patches which are in > staging, but missing in linux-next) I rebased the complete patch set against linux-next in: git://gitorious.org/~jak/ac100/jaks-marvin24s-kernel.git linux-next It consists of 35 commits, and one even misses a Signed-off-by from Marc at the moment. This will be rebased and modified accordingly, but it should serve as a first impression of what's coming. I hope to have the patch series cleaned up for staging tomorrow or Saturday. -- Julian Andres Klode - Debian Developer, Ubuntu Member See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/. _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
