From: Mauro Carvalho Chehab <maurochehab@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Randy Dunlap <randy.dunlap@oracle.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Date: Wed, 2 Sep 2009 23:12:14 -0300 [thread overview]
Message-ID: <20090902231214.495d4002@pedra.chehab.org> (raw)
In-Reply-To: <20090902121713.f709b1ce.sfr@canb.auug.org.au>
Em Wed, 2 Sep 2009 12:17:13 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/Kconfig between commit
> b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
> sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
> 7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
> gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
> v4l-dvb tree.
>
> I fixed it up (see below) and will carry the fix for a while.
Thanks.
I've rebased it to fix this merge conflict between my devel tree and upstream.
You probably can drop it on your next merge.
Atenciosamente,
Prof. Mauro Carvalho Chehab, MSc, CISSP
maurochehab@gmail.com
next prev parent reply other threads:[~2009-09-03 2:12 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-02 2:17 linux-next: manual merge of the v4l-dvb tree with Linus' tree Stephen Rothwell
2009-09-03 2:12 ` Mauro Carvalho Chehab [this message]
2009-09-03 6:49 ` Stephen Rothwell
2010-04-07 1:00 Stephen Rothwell
2010-04-09 5:22 ` Mauro Carvalho Chehab
2010-04-09 7:13 ` Stephen Rothwell
2010-05-10 0:29 Stephen Rothwell
2010-05-10 0:32 Stephen Rothwell
2010-05-11 5:19 ` Hiremath, Vaibhav
2010-05-10 0:36 Stephen Rothwell
2010-05-11 23:23 ` Mauro Carvalho Chehab
2010-05-12 0:23 ` Stephen Rothwell
2010-05-13 1:52 Stephen Rothwell
2010-07-06 2:01 Stephen Rothwell
2011-03-22 1:00 Stephen Rothwell
2011-04-08 3:27 Stephen Rothwell
2011-07-29 3:17 Stephen Rothwell
2011-07-29 4:10 ` Mauro Carvalho Chehab
2011-07-29 7:29 ` 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
2012-10-02 1:13 Stephen Rothwell
2013-08-29 2:48 Stephen Rothwell
2014-01-14 0:50 Stephen Rothwell
2015-04-10 3:53 Stephen Rothwell
2015-04-21 1:50 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-09-07 23:20 Stephen Rothwell
2016-08-04 1:02 Stephen Rothwell
2019-01-31 23:22 Stephen Rothwell
2019-01-31 23:27 ` Stephen Rothwell
2019-05-23 23:21 Stephen Rothwell
2019-06-06 0:43 Stephen Rothwell
2019-06-24 1:36 Stephen Rothwell
2021-10-01 0:33 Stephen Rothwell
2021-10-01 6:46 ` Sean Young
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=20090902231214.495d4002@pedra.chehab.org \
--to=maurochehab@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--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;
as well as URLs for NNTP newsgroup(s).