From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-next@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream build failure: v4l/dvb)
Date: Thu, 1 May 2008 10:37:27 +1000 [thread overview]
Message-ID: <20080501103727.25929df2.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080430161224.71c154ca@gaivota>
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
Hi Mauro,
On Wed, 30 Apr 2008 16:12:24 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Anyway, I've already dropped those patches that were already applied from my
> tree. You should get a clean merge tomorrow.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
prev parent reply other threads:[~2008-05-01 0:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-30 1:41 linux-next: upstream build failure: v4l/dvb Stephen Rothwell
2008-04-30 2:00 ` Mauro Carvalho Chehab
2008-04-30 3:49 ` linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream build failure: v4l/dvb) Stephen Rothwell
2008-04-30 19:12 ` Mauro Carvalho Chehab
2008-05-01 0:37 ` Stephen Rothwell [this message]
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=20080501103727.25929df2.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=torvalds@linux-foundation.org \
/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®