From mboxrd@z Thu Jan  1 00:00:00 1970
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753713AbeADQGi (ORCPT <rfc822;ralf@linux-mips.org> + 1 other);
        Thu, 4 Jan 2018 11:06:38 -0500
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:34599 "EHLO
        out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
        by vger.kernel.org with ESMTP id S1753615AbeADQGg (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 4 Jan 2018 11:06:36 -0500
X-ME-Sender: <xms:C1FOWtzNye2056NCHlvd6TBbDBYsBZ2W4KaMgAGIElIhyowQH6QAVw>
Date: Thu, 4 Jan 2018 17:06:42 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Shuah Khan <shuahkh@osg.samsung.com>,
        Colin Ian King <colin.king@canonical.com>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree
Message-ID: <20180104160642.GA9238@kroah.com>
References: <20171220130949.51553723@canb.auug.org.au>
 <20171220093615.GA17337@kroah.com>
 <20180103115642.4653ce2f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180103115642.4653ce2f@canb.auug.org.au>
User-Agent: Mutt/1.9.2 (2017-12-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

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@kroah.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