Subject: Re: linux-next: v4l-dvb tree build failure

From: Mauro Carvalho Chehab <[email-masked]>
Date: Wed, 3 Dec 2008 20:48:30 -0200

On Wed, 3 Dec 2008 09:23:54 +1100
Stephen Rothwell <[email-masked]> wrote:

> Hi Mauro,
> 
> On Tue, 2 Dec 2008 08:03:02 -0200 Mauro Carvalho Chehab <[email-masked]> wrote:
> >
> > I suspect you've pulled from my tree while I was testing it, or before my last
> > update yesterday night. Anyway, I've re-merged my patches at my linux-next and
> > tested. Everything seems to be ok now.
> 
> You should do things in this order:
> 	write, and test your own patches
> 	gather patches form other people
> 	make sure all the patches have been posted on some appropriate
> 		mailing list for review
> 	put all the patches in a private tree
> 	test
All of those are done.

I also have some additional steps, since the development repository is based on mercurial:

	Convert patches to -git
	Split fixes and next patches
	Solve merge conflicts, when a linux-next patch depends on an upstream patch;
	Merge the trees again, for linux-next;
> 	publish the tree for linux-next (and others)

Cheers,
Mauro