All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
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>
Subject: Re: linux-next: manual merge of the usb tree with Linus' tree
Date: Mon, 21 Jan 2013 13:02:19 -0800	[thread overview]
Message-ID: <20130121210219.GB9184@kroah.com> (raw)
In-Reply-To: <20130121150711.c4673d930c2f00253c2e471a@canb.auug.org.au>

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

  reply	other threads:[~2013-01-21 21:02 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-21  4:07 linux-next: manual merge of the usb tree with Linus' tree Stephen Rothwell
2013-01-21 21:02 ` Greg KH [this message]
2013-01-25 20:52   ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2011-02-07  4:08 Stephen Rothwell
2011-02-09  2:31 ` Xu, Andiry
2011-02-09  2:31   ` Xu, Andiry
2011-02-09  5:42 ` Xu, Andiry
2011-02-09  5:42   ` Xu, Andiry
2011-02-17 18:04 ` Greg KH
2010-12-16  3:01 Stephen Rothwell
2010-12-16  3:08 ` Greg KH
2010-12-16  8:05   ` Felipe Balbi
2010-12-16  8:45     ` Felipe Balbi
2010-12-16 15:52       ` Greg KH
2010-12-16 15:55         ` Felipe Balbi
2010-12-16 17:44           ` Greg KH
2010-12-16 18:14             ` Greg KH
2010-12-16 22:33               ` Stephen Rothwell
2010-12-06  1:47 Stephen Rothwell
2010-12-07  4:43 ` Greg KH
2010-12-07  5:49   ` Felipe Balbi
     [not found] <20100805132208.74bf6ab9.sfr@canb.auug.org.au>
2010-08-05 10:17 ` Jiri Kosina
2010-08-05 10:35   ` Michał Nazarewicz
2010-08-05 22:36     ` Greg KH
2009-12-23 22:30 Stephen Rothwell
2009-12-23 23:38 ` Greg KH
2009-12-24  0:22   ` Stephen Rothwell
2009-09-23  6:38 Stephen Rothwell
2009-09-23 12:38 ` Jason Wessel
2009-09-23 12:50   ` Stephen Rothwell
2009-09-23 13:20     ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130121210219.GB9184@kroah.com \
    --to=greg@kroah.com \
    --cc=jhovold@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=wfpub@roembden.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.