Hi Greg, Thanks. Yes, I will look into drivers/staging/android and try to straighten things out between kernel.org tree and our trees. -- Petri On Mon, Sep 14, 2009 at 3:17 PM, Greg KH<greg@xxxxxxxxx> wrote: > On Mon, Sep 14, 2009 at 03:14:50PM -0700, Brian Swetland wrote: >> On Thu, Sep 10, 2009 at 4:24 PM, Greg KH <greg@xxxxxxxxx> wrote: >> > On Thu, Sep 10, 2009 at 04:07:21PM -0700, Brian Swetland wrote: >> >> We actually are very interested, but are not likely to have >> >> significant time to devote to this until mid-late october due to >> >> schedule pressure for various shipping-this-fall projects. We tend to >> >> have a bit of a lull between October and January and my hope is to get >> >> a bunch of patches cleaned up and out there in this timeframe -- we'll >> >> also be rebasing our development branches on the latest mainline >> >> kernel during this time. >> >> >> >> I'm also working to get an engineer dedicated (20% or more time) to >> >> contribution-to-mainline efforts on an on-going basis in the near >> >> future, to help improve responsiveness here. >> > >> > Ok, thanks for letting me know, I'll hold off removing them for .32, but >> > if by the time the .33 merge window opens up and there is no change, >> > I'll remove them. Sound reasonable? >> >> Hi Greg, Pavel, >> >> I'd like to introduce Petri Gynther, who will is going to be working >> on android->mainline kernel effort from our side (other folks from our >> side will be involved as well, but Petri is the point guy right now). >> He's initially going to be doing a rebase of our 2.6.29 work trees to >> 2.6.31 so our codebase is up to date with .31 and then his priority is >> to get patches going upstream, aiming at closing the gap between our >> work tree and mainline. > > Great! > > Hi Petri, good luck with this :) > > Please work toward resolving the conflicts with any changes you all have > done in your trees with the code that is already in the kernel.org tree > in drivers/staging/android/. Getting that straightened out first would > be the best thing. > > thanks, > > greg k-h > _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
