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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200115144057.7b72d7b9@canb.auug.org.au>
Date:   Wed, 15 Jan 2020 14:40:57 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Felipe Balbi <balbi@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jayshri Pawar <jpawar@...ence.com>,
        Pawel Laszczak <pawell@...ence.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Subject: Re: linux-next: manual merge of the usb-gadget tree with Linus'
 tree

Hi Geert,

On Tue, 14 Jan 2020 09:41:57 +0100 Geert Uytterhoeven <geert@...ux-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

Content of type "application/pgp-signature" skipped