public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mauro Carvalho Chehab <mchehab@infradead•org>
Cc: linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the v4l-dvb tree
Date: Mon, 27 Oct 2008 18:16:32 +1100	[thread overview]
Message-ID: <20081027181632.97d18410.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20081014182846.d60f2e8b.sfr@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

Hi Mauro,

On Tue, 14 Oct 2008 18:28:46 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a lot of conflicts
> against Linus' tree.  It looks like it has been rebased and has
> cherry-picked a lot of commits from Linus' tree.  However it got into
> this state, it needs a major fixup.
> 
> I have dropped it for today.

And continue to do so.  Please clean it up.

(Just as a reminder, I fetch your "stable" branch.)

-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

  reply	other threads:[~2008-10-27  7:16 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14  7:28 linux-next: manual merge of the v4l-dvb tree Stephen Rothwell
2008-10-27  7:16 ` Stephen Rothwell [this message]
2008-10-28 11:48   ` Mauro Carvalho Chehab
2008-10-28 12:04     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2010-05-13  3:00 Stephen Rothwell
2010-05-13  5:18 ` Mauro Carvalho Chehab
2010-05-13  5:59   ` Stephen Rothwell
2008-09-01  3:22 Stephen Rothwell
2008-09-01  3:14 Stephen Rothwell
2008-09-01  3:42 ` Stephen Rothwell
2008-09-04  4:44   ` Mauro Carvalho Chehab
2008-08-19  4:11 Stephen Rothwell
2008-08-19  5:59 ` Hans Verkuil
2008-08-19 19:55 ` Greg KH
2008-07-29  3:03 Stephen Rothwell
2008-07-04  4:45 Stephen Rothwell
2008-06-30  4:56 Stephen Rothwell
2008-06-30 11:14 ` Mauro Carvalho Chehab
2008-06-30  4:49 Stephen Rothwell
2008-06-30  4:44 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=20081027181632.97d18410.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=mchehab@infradead$(echo .)org \
    /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