From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the usb tree with Linus' tree
Date: Fri, 25 Jan 2013 12:52:09 -0800
Message-ID: <20130125205209.GA8950@kroah.com>
References: <20130121150711.c4673d930c2f00253c2e471a@canb.auug.org.au>
 <20130121210219.GB9184@kroah.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46450 "EHLO
	out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751448Ab3AYUwM (ORCPT
	<rfc822;linux-next@vger.kernel.org>);
	Fri, 25 Jan 2013 15:52:12 -0500
Content-Disposition: inline
In-Reply-To: <20130121210219.GB9184@kroah.com>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Wolfgang Frisch <wfpub@roembden.net>, Johan Hovold <jhovold@gmail.com>

On Mon, Jan 21, 2013 at 01:02:19PM -0800, Greg KH wrote:
> On Mon, Jan 21, 2013 at 03:07:11PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix
> > NULL dereference in chase_port()") from Linus' tree and commit
> > f40d781554ef ("USB: io_ti: kill custom closing_wait implementation") from
> > the usb tree.
> > 
> > I fixed it up (the latter removed the code fixed by the former, so I just
> > used thet) and can carry the fix as necessary (no action is required).
> 
> Yes, that is the correct fix, thanks for this.

This should now be resolved in my trees.

thanks,

greg k-h