Hi Greg,

On Fri, 10 Jun 2022 11:20:13 +0200 Greg KH <greg@kroah.com> wrote:
> > 
> > This merge resolution seems to have been lost somewhere along the way
> > :-(  
> 
> I've taken your resolution in the tree now, sorry for the delay.

Thanks.   I have now dropped my copy.

-- 
Cheers,
Stephen Rothwell