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,
Bernd Bassimir <bassimir.kernel@gmx.de>,
Nico Doerr <nico.doerr@hawo.net>
Subject: Re: linux-next: manual merge of the staging tree with the usb tree
Date: Tue, 18 Jun 2013 09:03:33 -0700 [thread overview]
Message-ID: <20130618160333.GC28961@kroah.com> (raw)
In-Reply-To: <20130618145559.cc7923dac280e736c908a422@canb.auug.org.au>
On Tue, Jun 18, 2013 at 02:55:59PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f
> ("USB: serial: ports: add minor and port number") from the usb tree and
> commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style
> CamelCases") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks fine, thanks.
greg k-h
next prev parent reply other threads:[~2013-06-18 16:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 4:55 linux-next: manual merge of the staging tree with the usb tree Stephen Rothwell
2013-06-18 16:03 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-05-01 4:09 Stephen Rothwell
2017-05-04 23:42 ` Greg KH
2012-09-19 4:35 Stephen Rothwell
2012-09-19 7:18 ` Greg KH
2012-05-11 5:12 Stephen Rothwell
2012-05-11 14:44 ` Greg KH
2012-04-24 4:48 Stephen Rothwell
2012-04-24 14:45 ` Greg KH
2012-04-23 5:11 Stephen Rothwell
2012-04-23 16:38 ` 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=20130618160333.GC28961@kroah.com \
--to=greg@kroah.com \
--cc=bassimir.kernel@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nico.doerr@hawo.net \
--cc=sfr@canb.auug.org.au \
/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.