* James Cloos <[EMAIL PROTECTED]> wrote:
> If instead of pulling master into the cfs branch, I rather switch to
> the master branch and pull the cfs branch into that, it works.
ah! Could you please do a git-diff between the broken and the working
tree, to see what got mismerged?
Ingo
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
