From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Brian Johnson <brijohn@gmail.com>,
Yong Zhang <yong.zhang0@gmail.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Tue, 11 May 2010 20:23:08 -0300 [thread overview]
Message-ID: <4BE9E6DC.1030800@infradead.org> (raw)
In-Reply-To: <20100510103621.4ffbc8c3.sfr@canb.auug.org.au>
Hi Stephen,
Stephen Rothwell wrote:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/sn9c20x.c between commit
> a76b9f49ba58d081e373080ff75130673140d3f1 ("V4L/DVB: gspca - sn9c20x:
> Correct onstack wait_queue_head declaration") from Linus' tree and commit
> a0965d58c1aa34ab66f3e2b5abd770f18f393905 ("V4L/DVB: gspca - sn9c20x: use
> gspca's input device handling") from the v4l-dvb tree.
>
> The latter just removed the code modified by the former.
Conflicts solved. They were generated by an upstream merge from
my fixes tree.
--
Cheers,
Mauro
next prev parent reply other threads:[~2010-05-11 23:23 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 0:36 linux-next: manual merge of the v4l-dvb tree with Linus' tree Stephen Rothwell
2010-05-11 23:23 ` Mauro Carvalho Chehab [this message]
2010-05-12 0:23 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-08-26 1:39 Stephen Rothwell
2021-10-01 0:33 Stephen Rothwell
2021-10-01 6:46 ` Sean Young
2019-06-24 1:36 Stephen Rothwell
2019-06-06 0:43 Stephen Rothwell
2019-05-23 23:21 Stephen Rothwell
2019-01-31 23:22 Stephen Rothwell
2019-01-31 23:27 ` Stephen Rothwell
2016-08-04 1:02 Stephen Rothwell
2015-09-07 23:20 Stephen Rothwell
2015-04-21 1:54 Stephen Rothwell
2015-04-21 7:49 ` Laurent Pinchart
2015-04-21 8:02 ` Stephen Rothwell
2015-04-21 9:56 ` Mauro Carvalho Chehab
2015-04-21 12:38 ` Laurent Pinchart
2015-04-21 13:12 ` Mauro Carvalho Chehab
2015-04-21 13:36 ` Philipp Zabel
2015-04-21 1:50 Stephen Rothwell
2015-04-10 3:53 Stephen Rothwell
2014-01-14 0:50 Stephen Rothwell
2013-08-29 2:48 Stephen Rothwell
2012-10-02 1:13 Stephen Rothwell
2012-06-19 1:29 Stephen Rothwell
2012-06-19 10:06 ` Jiri Kosina
2012-06-19 11:50 ` Hans de Goede
2012-06-19 11:52 ` Jiri Kosina
2011-07-29 3:17 Stephen Rothwell
2011-07-29 4:10 ` Mauro Carvalho Chehab
2011-07-29 7:29 ` Stephen Rothwell
2011-04-08 3:27 Stephen Rothwell
2011-03-22 1:00 Stephen Rothwell
2010-07-06 2:01 Stephen Rothwell
2010-05-13 1:52 Stephen Rothwell
2010-05-10 0:32 Stephen Rothwell
2010-05-11 5:19 ` Hiremath, Vaibhav
2010-05-10 0:29 Stephen Rothwell
2010-04-07 1:00 Stephen Rothwell
2010-04-09 5:22 ` Mauro Carvalho Chehab
2010-04-09 7:13 ` Stephen Rothwell
2009-09-02 2:17 Stephen Rothwell
2009-09-03 2:12 ` Mauro Carvalho Chehab
2009-09-03 6:49 ` 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=4BE9E6DC.1030800@infradead.org \
--to=mchehab@infradead.org \
--cc=brijohn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yong.zhang0@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.