>>> Please split the patch into one part for backporting and one part for
>>> master-only and post both patches, clearly indicating which is which.
>>
>> Attached are the full patch for head and the backport part (the patch name
>> ends with "backport") separated.
>
> That's not really what I wanted; the full page includes the stuff for
> back-porting, whereas I wanted two independent patches.
Indeed, I misunderstood the requirement.
> I wordsmithed your version of Tomas's patch and pushed that to 9.5 and
> master, and I pushed the first hunk of your full patch to master also.
> I think the last hunk of that is overkill, so I did not push that.
Ok.
--
Fabien.