From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 5 May 2008 13:09:11 -0700
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.
--