public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Mauro Carvalho Chehab <mchehab@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the v4l-dvb tree
Date: Tue, 28 Oct 2008 09:48:27 -0200	[thread overview]
Message-ID: <20081028094827.1c4e4f97@pedra.chehab.org> (raw)
In-Reply-To: <20081027181632.97d18410.sfr@canb.auug.org.au>

Hi Stephen,

On Mon, 27 Oct 2008 18:16:32 +1100
Stephen Rothwell <sfr@canb•auug.org.au> wrote:

> 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.)

I've changed my git procedures on 2.6.27 to avoid having to rebase my tree, but
this works really badly, generating lots of rework for me. So, I had to alter
my procedures again for 2.6.28.

Now, everything is simpler and I hope it will work like a charm.

I've finished those procedures yesterday by preparing my first set of patches
after the end of the merge window, with an independent tree with patches that
aren't just fixes (in the past, this were a branch at the same tree, but this
weren't work fine).

I've just updated today my linux-next tree. I'm now using branch "master" for
V4L/DVB patches. "stable" is now just a copy of your "stable" branch.

I have one doubt about what would work better for you: should I merge also the
patches for the current kernel version, that I intend to send upstream, or it
would be better to just have there the newer patches for the next version?

Anyway, please start pushing from 
 ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git master

Cheers,
Mauro

next prev parent reply	other threads:[~2008-10-28 11:48 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
2008-10-28 11:48   ` Mauro Carvalho Chehab [this message]
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=20081028094827.1c4e4f97@pedra.chehab.org \
    --to=mchehab@infradead$(echo .)org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox