archive mirror
 help / color / mirror / Atom feed
From: Greg KH <>
To: Stephen Rothwell <>
Subject: Re: linux-next: usb.current merge conflict
Date: Wed, 14 May 2008 19:39:11 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Thu, May 15, 2008 at 11:12:44AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the usb.current tree got a trivial conflict
> in drivers/usb/gadget/serial.c.  It looks like someone fixed up the
> spacing around some ','s before the "USB: serial gadget: cleanup/reorg"
> patch went into Linus' tree.

Yes, I did some cleanups before sending them to Linus,
they will merge away with the next -git release that comes out tomorrow.


greg k-h

      reply	other threads:[~2008-05-15  2:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-15  1:12 linux-next: usb.current merge conflict Stephen Rothwell
2008-05-15  2:39 ` Greg KH [this message]

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:

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

  git send-email \ \ \ \ \

* 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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).