I don't think it's quite that simple :-D

A pre-requisite to supporting 2.11 in the same source tree is that we drop 2.9 support. Many of the APIs we are using are simply not source compatible from 2.9 to 2.11. If anything, I recommend having separate branches.