> So this is in no way your fault, but this particular file has been the
> subject of some merge conflicts in linux-next already, so it's probably
> best not to mess with it further at the moment. Could I ask you to
> resubmit the patch after the 5.5 merge window?

Yes that is fine!
Thanks.