From: Jiri Kosina <jkosina@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Masanari Iida <standby24x7@gmail.com>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: Re: linux-next: manual merge of the trivial tree with the v4l-dvb tree
Date: Thu, 1 Mar 2012 09:28:17 +0100 (CET) [thread overview]
Message-ID: <alpine.LNX.2.00.1203010927080.23367@pobox.suse.cz> (raw)
In-Reply-To: <20120229143359.e983bed880aded7b8f99b6bf@canb.auug.org.au>
On Wed, 29 Feb 2012, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/media/video/s5p-tv/hdmi_drv.c due to commit 382d19f197f9 ("media:
> Fix typo in mixer_drv.c and hdmi_drv.c") from the trivial tree also
> already existing in the v4l-dvb tree (same patch different commit) (and
> there are further changes in that tree to this file).
>
> I just the used the version from the v4l-dvb tree.
Reverted now in my tree, thanks.
--
Jiri Kosina
SUSE Labs
next prev parent reply other threads:[~2012-03-01 8:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-29 3:33 Stephen Rothwell
2012-03-01 8:28 ` Jiri Kosina [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-18 3:58 Stephen Rothwell
2011-09-27 4:23 Stephen Rothwell
2010-12-28 0:47 Stephen Rothwell
2010-12-28 13:18 ` Jiri Kosina
2010-12-28 0:44 Stephen Rothwell
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
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=alpine.LNX.2.00.1203010927080.23367@pobox.suse.cz \
--to=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=standby24x7@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®