> Your changes are obviously correct, but you'll have to solve the merge > conflict again when applying Benjamin's patch, sorry. I know and I am OK. Still, I wanted your patch to be in v4.9 while Benjamin's patches look like v4.10 material to me.
Attachment:
signature.asc
Description: PGP signature
