From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead•org>
Cc: linux-next@vger•kernel.org,
Devin Heitmueller <devin.heitmueller@gmail•com>
Subject: linux-next: manual merge of the v4l-dvb tree
Date: Mon, 30 Jun 2008 14:49:04 +1000 [thread overview]
Message-ID: <20080630144904.5178a024.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a trivial conflict in
drivers/media/video/em28xx/em28xx-cards.c between commit
b38cc642000f0a262db367ffb95cd02ca2ead59b (V4L/DVB (8011): em28xx: enable
DVB for HVR-900"") from Linus' tree (which also exists in the dvb-v4l
tree) and commit bcb323c2fc5555307589386bffc58abd2a397661 ("V4L/DVB
(8006): em28xx: Split HVR900 into two separate entries") from the v4l-dvb
tree.
Same comments as the other conflict.
--
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-06-30 4:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-30 4:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-13 3:00 linux-next: manual merge of the v4l-dvb tree Stephen Rothwell
2010-05-13 5:18 ` Mauro Carvalho Chehab
2010-05-13 5:59 ` Stephen Rothwell
2008-10-14 7:28 Stephen Rothwell
2008-10-27 7:16 ` Stephen Rothwell
2008-10-28 11:48 ` Mauro Carvalho Chehab
2008-10-28 12:04 ` Stephen Rothwell
2008-09-01 3:22 Stephen Rothwell
2008-09-01 3:14 Stephen Rothwell
2008-09-01 3:42 ` Stephen Rothwell
2008-09-04 4:44 ` Mauro Carvalho Chehab
2008-08-19 4:11 Stephen Rothwell
2008-08-19 5:59 ` Hans Verkuil
2008-08-19 19:55 ` Greg KH
2008-07-29 3:03 Stephen Rothwell
2008-07-04 4:45 Stephen Rothwell
2008-06-30 4:56 Stephen Rothwell
2008-06-30 11:14 ` Mauro Carvalho Chehab
2008-06-30 4:44 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=20080630144904.5178a024.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=devin.heitmueller@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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