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: Mon, 21 Jan 2013 13:02:19 -0800
Message-ID: <20130121210219.GB9184@kroah.com>
References: <20130121150711.c4673d930c2f00253c2e471a@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20130121150711.c4673d930c2f00253c2e471a@canb.auug.org.au>
Sender: linux-kernel-owner@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>
List-Id: linux-next.vger.kernel.org

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.

greg k-h