Sorry, I forgot to reply to the last part: On Mon, 2009-09-14 at 20:54 +0400, Yakovenko Oleg wrote: > > > Is my understanding correct that Inaky maintains the whole wimax > > > source (both drivers and the stack) and sometimes it gets merged to > > > the mainline kernel? > > > > Yes. whenever the merge window open, I submit feature enhancements and > > minor bug fixes. Major bug fixes I send as they pop up. > > What about the different branches? I see there are these branches in > your repository: > > -- master > -- op_nap_scan > -- linux-2.6.31.y > -- linux-2.6.30.y > -- linux-2.6.29.y > > Is it correct to say that linux-2.6* branches are used for creating patches > against a corresponding linux- version, the master branch is used for main > development and the op_nap_scan branch will be merged to master branch when > the work is done there? Yes, correct. When a new merge window opens (this usually happens when David Miller opens net-next-2.6 for revision X -- around the time when 2.6.X-1 reaches rc6), then I create linux-2.6.X.y and cherry pick commits from master to there, which then I ask David to pull to net-next-2.6. -- -- Inaky
