On Thu, Jun 24, 2021 at 11:01:32AM +0200, Johan Hovold wrote:
> Hi Greg,
>
> Here are the USB serial updates for 5.14-rc1.
>
> Note that you'll get a merge conflict in cp210x between
>
> 6f7ec77cc8b6 ("USB: serial: cp210x: fix alternate function for CP2102N QFN20")
>
> which is already in your tree and
>
> 8051334e901f ("USB: serial: cp210x: add support for GPIOs on CP2108")
>
> This was also reported by Stephen here
>
> https://lore.kernel.org/r/20210617150224.19213166@xxxxxxxxxxxxxxxx
>
> and the resolution should be straight forward.
>
> Let me know if you prefer I pull in Linus's rc:s like you do to resolve any
> issues like this in the future.
Not a problem, now pulled and pushed out, thanks.
greg k-h
