On Sun, Oct 24, 2010 at 14:24, Jonathan Cameron wrote: > On 10/24/10 16:58, Mike Frysinger wrote: >> On Sun, Oct 24, 2010 at 07:09, Jonathan Cameron wrote: >>> Unfortunately that isn't where they are going to merge. ÂThe change >>> required won't be huge, but Greg isn't going to take them if they >>> don't merge cleanly. >> >> they merge cleanly, they just dont compile :p. Âwhat tree exactly >> contains these changes you're referring to ? >> > either linux-next or staging-next branch of > http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-next-2.6.git;a=summary > > The all went in a few weeks back. i guess the trouble is that that tree is labeled as "junk tree, please ignore". maybe gregkh can fix the labeling of his trees to reflect reality. > Personally I just work against Gregs staging-next tree. our current development tends to focus on current release since that is what we are pushing to customers. i know this doesnt properly reflect the merging process, but it's what we have resources for today. -mike -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
