> > Jon, unless you have strong objections, I'd like to take this > > through my tree due to the header file changes. > > Is there any chance of splitting those two things up? In particular, > index.rst has become a real conflict point, and I'm getting tired of > explaining those to Linus...so I'd prefer to carry that part if > possible. Hmm. It may be easier then to take this through your tree entirely. I could split it, and ask you to add only the index.rst change. However, if this is a contention point, then the DocBook/Makefile will also be the same contention point at least as far as conversions are concerned, and if I don't have *that* in my tree either then the (documentation) build will be broken by the removal of the template. So ultimately then it'll be better for you to just take almost all of the conversion through your tree. The header file changes normally wouldn't be a big deal, they're in comments only, but in this case I know that we have a work-in-progress patch submission that will change things here, and I'd like that to already use the new format. Maybe I can just take the relevant header file change through my tree? It would cause the following warning to appear in your tree: include/net/cfg80211.h:3093: WARNING: Definition list ends without a blank line; unexpected unindent. include/net/cfg80211.h:3095: ERROR: Unexpected indentation. include/net/cfg80211.h:3099: WARNING: Block quote ends without a blank line; unexpected unindent. include/net/cfg80211.h:3107: WARNING: Definition list ends without a blank line; unexpected unindent. include/net/cfg80211.h:3109: ERROR: Unexpected indentation. include/net/cfg80211.h:3113: WARNING: Block quote ends without a blank line; unexpected unindent. include/net/cfg80211.h:3123: ERROR: Unexpected indentation. include/net/cfg80211.h:3124: WARNING: Definition list ends without a blank line; unexpected unindent. include/net/cfg80211.h:3126: ERROR: Unexpected indentation. include/net/cfg80211.h:3130: WARNING: Block quote ends without a blank line; unexpected unindent. for the time being - perhaps you can live with that, until my changes also propagate through to the tree? Alternatively, I could merge the header file change, and hold this patch until my changes hit the tree, but that will be a long time coming, presumably, since I'll have missed the merge window with both of the changes. johannes
