Re: + git-net-git-rejects.patch added to -mm tree

From: Andrew Morton
Date: Mon May 05 2008 - 17:18:19 EST


On Mon, 05 May 2008 14:04:50 -0700 (PDT)
David Miller <davem@xxxxxxxxxxxxx> wrote:

> From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Date: Mon, 5 May 2008 13:09:11 -0700
>
> > I noticed that there were rather a lot of changes in
> > git+ssh://master.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
> > which are not in linux-next, perhaps due to time lag.
>
> Andrew, I think you simply have to "let go" of one side or
> the other.
>
> If you're going to base on top of linux-next, then let it run
> it's course and don't try to suck in the GIT trees on top
> of that which linux-next takes already.

It could be that this is what I end up doing - I just don't know yet.

One downside of the linux-next lag is that I can end up merging patches
which others have already merged (more than usual).

I'm still working these things out..
--
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/