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,
Devendra Naga <devendra.aaru@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the usb tree
Date: Wed, 19 Sep 2012 08:18:00 +0100 [thread overview]
Message-ID: <20120919071800.GE16905@kroah.com> (raw)
In-Reply-To: <20120919143505.76e9d77d320ed278f7ce4798@canb.auug.org.au>
On Wed, Sep 19, 2012 at 02:35:05PM +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 e8656b02ef35
> ("USB: serial: serqt_usb2: remove dbg() usage") from the usb tree and
> commit 623c2bb2c59a ("staging: serqt_usb2: fix dbg print when kzalloc
> failed to allocate qt_port") from the staging tree.
>
> The former removes the line changed by the latter, so I just did that (no
> action is required).
That looks correct, thanks for doing this.
greg k-h
next prev parent reply other threads:[~2012-09-19 7:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-19 4:35 linux-next: manual merge of the staging tree with the usb tree Stephen Rothwell
2012-09-19 7:18 ` 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
2013-06-18 4:55 Stephen Rothwell
2013-06-18 16:03 ` 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=20120919071800.GE16905@kroah.com \
--to=greg@kroah.com \
--cc=devendra.aaru@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 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).