From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Hans Verkuil" <hverkuil@xs4all•nl>,
"Mauro Carvalho Chehab" <mchehab@redhat•com>,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix•de>
Subject: linux-next: manual merge of the trivial tree with the v4l-dvb tree
Date: Tue, 28 Dec 2010 11:44:51 +1100 [thread overview]
Message-ID: <20101228114451.a24d0ead.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/zoran/zoran.h between commit
8221f9b5fa3e08ba35378f08f2a606156e685916 ("[media] zoran: remove V4L1
compat code and zoran custom ioctls") from the v4l-dvb tree and commit
b595076a180a56d1bb170e6eceda6eb9d76f4cd3 ("tree-wide: fix comment/printk
typos") from the trivial tree.
The former removed the code modified by the latter, so I used the former.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-12-28 0:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-28 0:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-18 3:58 linux-next: manual merge of the trivial tree with the v4l-dvb tree Stephen Rothwell
2012-02-29 3:33 Stephen Rothwell
2012-03-01 8:28 ` Jiri Kosina
2011-09-27 4:23 Stephen Rothwell
2010-12-28 0:47 Stephen Rothwell
2010-12-28 13:18 ` Jiri Kosina
2010-07-06 5:25 Stephen Rothwell
2010-07-11 20:41 ` Jiri Kosina
2010-07-12 4:15 ` Stephen Rothwell
2009-12-07 4:33 Stephen Rothwell
2009-02-17 8:28 Stephen Rothwell
2009-02-17 11:35 ` Jiri Kosina
2009-02-17 12:24 ` Stephen Rothwell
2009-02-17 13:03 ` Mauro Carvalho Chehab
2009-02-17 13:07 ` Jiri Kosina
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=20101228114451.a24d0ead.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hverkuil@xs4all$(echo .)nl \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@redhat$(echo .)com \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/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