Perhaps just the patch that Andi posted to the stable list helps out here?
For reference:
https://www.spinics.net/lists/stable/msg253357.html
That would be the most straightforward and simple fix, so I would prefer to go with it if it works.
Sorry for being slow, it turned out to take a slightly bigger stack of patches to get everything working.
I agree, Andi's simple fix is better anyway.
- R.