From: Patrick Caulfield Date: Wed, 15 Nov 2006 10:11:35 +0000 Subject: [Cluster-devel] Re: [-mm patch] fix the DLM dependencies, part 2 In-Reply-To: <20061114225641.GP22565@stusta.de> References: <20061114014125.dd315fff.akpm@osdl.org> <20061114183324.GL22565@stusta.de> <20061114225641.GP22565@stusta.de> Message-ID: <455AE7D7.4020002@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Adrian Bunk wrote: > On Tue, Nov 14, 2006 at 07:33:24PM +0100, Adrian Bunk wrote: >> On Tue, Nov 14, 2006 at 01:41:25AM -0800, Andrew Morton wrote: >>> ... >>> - A nasty Kconfig warning comes out during the build. It's due to >>> git-gfs2-nmw.patch. >>> ... >> So let's fix it. ;-) >> ... > > And let's also fix another bug... > > > <-- snip --> > > > IPV6=m, DLM=m, DLM_SCTP=y mustn't result in IP_SCTP=y. > > Signed-off-by: Adrian Bunk > > --- linux-2.6.19-rc5-mm2/fs/dlm/Kconfig.old 2006-11-14 22:25:01.000000000 +0100 > +++ linux-2.6.19-rc5-mm2/fs/dlm/Kconfig 2006-11-14 22:25:19.000000000 +0100 > @@ -5,6 +5,7 @@ config DLM > tristate "Distributed Lock Manager (DLM)" > depends on IPV6 || IPV6=n > select CONFIGFS_FS > + select IP_SCTP if DLM_SCTP > help > A general purpose distributed lock manager for kernel or userspace > applications. > @@ -23,7 +24,6 @@ config DLM_TCP > > config DLM_SCTP > bool "SCTP" > - select IP_SCTP > > endchoice Thanks Adrian. I need to read the kconfig docs a little more closely :) Incidentally, I think the 'depends on IPV6 || IPV6=n' can go too; it's in a patch I sent to Steve and it's basically just a line copied from SCTP which is obsoleted by these other changes and the addition of the TCP transport. -- patrick