Subject: Re: linux-next: origin tree build failure

From: Linus Torvalds <[email-masked]>
Date: Sun, 28 Dec 2008 16:31:15 -0800 (PST)

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