From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the staging tree with the usb tree
Date: Tue, 24 Apr 2012 14:48:20 +1000 [thread overview]
Message-ID: <20120424144820.326e86452826927b86aaf0f5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB:
driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb
("Staging: line6: only allocate a buffer if it is needed") (and later)
from the staging tree.
The latter supercedes the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-04-24 4:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-24 4:48 Stephen Rothwell [this message]
2012-04-24 14:45 ` linux-next: manual merge of the staging tree with the usb tree Greg KH
-- 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-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-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=20120424144820.326e86452826927b86aaf0f5@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--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).