On Mon, 29 Dec 2008, Stephen Rothwell wrote: > > Maybe someone should have warned Linus about the below known interaction > between the net tree and the cifs tree ... Gaah. I should have grepped for it, since the other place caused a conflict that I fixed. And I even tested that the result of my conflict resolution compiled, but since I don't configure cifs myself, I literally tested just the conflicting file. Applied the fix, thanks, Linus -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
