linux-kernel - Re: linux-next: manual merge of the usb tree with the usb.current 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] [day] [month] [year] [list]

Message-ID: <20180104160642.GA9238@kroah.com>
Date:   Thu, 4 Jan 2018 17:06:42 +0100
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Shuah Khan <shuahkh@....samsung.com>,
        Colin Ian King <colin.king@...onical.com>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree

On Wed, Jan 03, 2018 at 11:56:42AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 20 Dec 2017 10:36:15 +0100 Greg KH <greg@...ah.com> wrote:
> >
> > Thanks for the fixup, I'll do it when these trees converge in a week or
> > so.
> 
> Unfortunately, it looks like when you back merged Linus' tree (to get
> commit 8272d099d05f) you lost the spelling fix in commit 81d8a8eb0a97.

Colin was good, he just resent it :)

thanks,

greg k-h