I think things would have been a lot easier if you had adopted
basing -mm on top of linux-next from the very start.
The responsiveness to problems and merge hassles has been so much
superior and efficient from the linux-next folks for my networking
stuff, for example. It's never been like that with -mm.
--