From: Hans Verkuil <hverkuil@xs4all.nl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
linux-next@vger.kernel.org,
Mauro Carvalho Chehab <mchehab@redhat.com>,
Arjan van de Ven <arjan@linux.intel.com>
Subject: Re: linux-next: manual merge of the rr tree with the v4l-dvb tree
Date: Tue, 17 Feb 2009 08:12:41 +0100 [thread overview]
Message-ID: <200902170812.41326.hverkuil@xs4all.nl> (raw)
In-Reply-To: <20090217161138.1c50812b.sfr@canb.auug.org.au>
On Tuesday 17 February 2009 06:11:38 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next merge of the rr tree got conflicts in
> drivers/media/video/saa7134/saa7134-core.c and
> drivers/media/video/saa7134/saa7134.h between commits
> 33a68ac0156dde8a60d8f23926d89b85be0a4e09 ("V4L/DVB (10247): saa7134:
> convert to the new v4l2 framework"),
> 9777b5ef44a88c8f16b885d9ea6a7240e170465e ("V4L/DVB (10404): saa7134-core:
> remove oss option, since saa7134-oss doesn't exist anymore") and
> d8f5b7fe03a2ee412b9aa7a7dc1b38c1c8d54d84 ("V4L/DVB (10405): saa7134-core:
> loading saa7134-alsa is now the default") from the v4l-dvb tree and
> commit 1b779d7819c3a19c4fdcb23144e7c2d04e4693fe ("use the new
> request_module_nowait() in drivers/media") from the rr tree.
>
> Overlapping changes. I fixed it up (see below, please check) and can
> carry the fix as necessary.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG
prev parent reply other threads:[~2009-02-17 7:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-17 5:11 linux-next: manual merge of the rr tree with the v4l-dvb tree Stephen Rothwell
2009-02-17 7:12 ` Hans Verkuil [this message]
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=200902170812.41326.hverkuil@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=arjan@linux.intel.com \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=rusty@rustcorp.com.au \
--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