Re: linux-next: manual merge of the usb-gadget tree with Linus' tree

Stephen Rothwell
2020-01-15T03:41:09Z

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

Hi Geert,

On Tue, 14 Jan 2020 09:41:57 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> For today's renesas-drivers, I'm using the attached conflict resolution.

Thanks, I will use your resolution from now on.
--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]