[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.00.0812281630100.3082@localhost.localdomain>
Date: Sun, 28 Dec 2008 16:31:15 -0800 (PST)
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
cc: Steve French <smfrench@...il.com>,
linux-cifs-client@...ts.samba.org,
"David S. Miller" <davem@...emloft.net>,
linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: origin tree build failure
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists