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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 15 Jan 2020 14:40:57 +1100

Hi Geert,

On Tue, 14 Jan 2020 09:41:57 +0100 Geert Uytterhoeven <[email-masked]> 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