From: Stefan Richter <stefanr@s5r6.in-berlin.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux1394-devel@lists.sourceforge.net, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the ieee1394 tree with the tree
Date: Fri, 06 Mar 2009 08:51:18 +0100 [thread overview]
Message-ID: <49B0D5F6.7000106@s5r6.in-berlin.de> (raw)
In-Reply-To: <20090306142032.0442213d.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Today's linux-next merge of the ieee1394 tree got a conflict in
> drivers/media/dvb/firewire/firedtv-avc.c between commit
> 154907957f9391b1af997b57507b16c018cc4995 ("firedtv: massive refactoring")
> from Linus' tree and commit 0435392b2594edeba33b2173326e73fdcd67bd50
> ("DVB: firedtv: fix printk format mismatch") from the ieee1394 tree.
>
> I used the latter version.
Thanks. I pushed this conflict resolution into linux1394-2.6.git too now.
--
Stefan Richter
-=====-==--= --== --==-
http://arcgraph.de/sr/
next prev parent reply other threads:[~2009-03-06 7:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 3:20 linux-next: manual merge of the ieee1394 tree with the tree Stephen Rothwell
2009-03-06 7:51 ` Stefan Richter [this message]
2009-03-07 0:39 ` 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=49B0D5F6.7000106@s5r6.in-berlin.de \
--to=stefanr@s5r6.in-berlin.de \
--cc=linux-next@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
--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