Re: linux-next: manual merge of the pci tree with the pci-currenttree

[Jesse Barnes]

On Fri, 26 Mar 2010 13:48:36 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Hi Jesse,
> 
> On Thu, 25 Mar 2010 19:10:49 -0700 Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote:
> >
> > Time to rebase my -next branch onto my for-linus branch again I guess.
> 
> Any reason you wouldn't just merge your for-linus branch into your -next branch?

I don't like to end up with a bunch of merges, so I generally just
rebase my -next branch as necessary.

-- 
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/