From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org,
Tomi Orava <tomimo@ncircle.nullnet.fi>,
Mauro Carvalho Chehab <mchehab@redhat.com>
Subject: linux-next: manual merge of the usb tree
Date: Tue, 14 Oct 2008 14:27:13 +1100 [thread overview]
Message-ID: <20081014142713.2d03ae75.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/media/dvb/cinergyT2/cinergyT2.c between commit
986bd1e58b18c09b753f797df19251804bfe3e84 ("V4L/DVB (9107): Alternative
version of Terratec Cinergy T2 driver") from Linus' tree and commit
58e43f3f48c28cc35be7502b5aa81ce53de51815 ("USB: remove warn() macro from
usb media drivers") from the usb tree.
The former commit removes the file, so I have done that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-10-14 4:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 3:27 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02 ` Srinivas Pandruvada
2008-11-10 1:06 Stephen Rothwell
2008-11-10 1:40 ` Greg KH
2008-10-14 3:53 Stephen Rothwell
2008-10-14 3:47 Stephen Rothwell
2008-10-14 3:37 Stephen Rothwell
2008-10-14 3:31 Stephen Rothwell
2008-10-14 5:44 ` Alexey Klimov
2008-07-17 0:54 Stephen Rothwell
2008-07-17 7:04 ` Greg KH
2008-07-16 2:02 Stephen Rothwell
2008-07-16 2:30 ` Greg KH
2008-07-16 7:06 ` Jaswinder Singh
2008-07-16 7:13 ` Stephen Rothwell
2008-07-16 7:20 ` Jaswinder Singh
2008-07-16 7:45 ` Stephen Rothwell
2008-07-16 7:49 ` Jaswinder Singh
2008-07-16 7:58 ` Stephen Rothwell
2008-07-07 3:09 Stephen Rothwell
2008-07-07 14:09 ` Alan Stern
2008-07-07 16:09 ` Stephen Rothwell
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=20081014142713.2d03ae75.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=tomimo@ncircle.nullnet.fi \
/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).