Re: linux-next: manual merge of the usb-gadget tree with Linus' tree
From: Stephen Rothwell
Date: Tue Jan 14 2020 - 22:41:10 EST
Hi Geert,
On Tue, 14 Jan 2020 09:41:57 +0100 Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> 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:
pgpUQvHsgKL8C.pgp
Description: OpenPGP digital signature