From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org
Subject: linux-next: usb.current merge conflict
Date: Thu, 15 May 2008 11:12:44 +1000 [thread overview]
Message-ID: <20080515111244.25b945ea.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2008-05-15 1:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-15 1:12 Stephen Rothwell [this message]
2008-05-15 2:39 ` linux-next: usb.current merge conflict 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=20080515111244.25b945ea.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
/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 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).