LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Steven Whitehouse <swhiteho@redhat.com>
To: Adrian Bunk <bunk@stusta.de>
Cc: Jiri Slaby <jirislaby@gmail.com>, Andrew Morton <akpm@osdl.org>,
	linux-kernel@vger.kernel.org,
	Randy Dunlap <randy.dunlap@oracle.com>,
	cluster-devel@redhat.com
Subject: Re: [-mm patch] fix GFS2 circular dependency
Date: Mon, 29 Jan 2007 09:12:07 +0000	[thread overview]
Message-ID: <1170061928.11001.140.camel@quoit.chygwyn.com> (raw)
In-Reply-To: <20070128161950.GS6017@stusta.de>

Hi,

Now applied to the GFS2 -nmw git tree. Thanks,

Steve.

On Sun, 2007-01-28 at 17:19 +0100, Adrian Bunk wrote:
> On Sun, Jan 28, 2007 at 11:08:18AM +0100, Jiri Slaby wrote:
> > Andrew Morton napsal(a):
> > >Temporarily at
> > >
> > >	http://userweb.kernel.org/~akpm/2.6.20-rc6-mm1/
> > 
> > Unable to select IPV6. Menuconfig doesn't offer it when INET is selected. 
> > When it's not it appears in the menu, but after state change it gets away. 
> > The same behaviour in xconfig, gconfig.
> > 
> > $ mkdir ../a/tst
> > $ make O=../a/tst menuconfig
> >   HOSTCC  scripts/basic/fixdep
> > [...]
> >   HOSTLD  scripts/kconfig/mconf
> > scripts/kconfig/mconf arch/i386/Kconfig
> > Warning! Found recursive dependency: INET GFS2_FS_LOCKING_DLM SYSFS 
> > OCFS2_FS INET
> > 
> > Maybe this is the problem?
> 
> Yes, patch below.
> 
> > regards,
> 
> cu
> Adrian
> 
> 
> <--  snip  -->
> 
> 
> This patch fixes a circular dependency by letting GFS2_FS_LOCKING_DLM 
> and DLM depend on instead of select SYSFS.
> 
> Since SYSFS depends on EMBEDDED this change shouldn't cause any problems 
> for users.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> ---
> 
>  fs/dlm/Kconfig  |    3 +--
>  fs/gfs2/Kconfig |    3 +--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> --- linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig.old	2007-01-28 16:44:17.000000000 +0100
> +++ linux-2.6.20-rc6-mm1/fs/gfs2/Kconfig	2007-01-28 16:44:59.000000000 +0100
> @@ -34,11 +34,10 @@
>  
>  config GFS2_FS_LOCKING_DLM
>  	tristate "GFS2 DLM locking module"
> -	depends on GFS2_FS && NET && INET && (IPV6 || IPV6=n)
> +	depends on GFS2_FS && SYSFS && NET && INET && (IPV6 || IPV6=n)
>  	select IP_SCTP if DLM_SCTP
>  	select CONFIGFS_FS
>  	select DLM
> -	select SYSFS
>  	help
>  	Multiple node locking module for GFS2
>  
> --- linux-2.6.20-rc6-mm1/fs/dlm/Kconfig.old	2007-01-28 16:56:57.000000000 +0100
> +++ linux-2.6.20-rc6-mm1/fs/dlm/Kconfig	2007-01-28 16:57:16.000000000 +0100
> @@ -3,9 +3,8 @@
>  
>  config DLM
>  	tristate "Distributed Lock Manager (DLM)"
> -	depends on IPV6 || IPV6=n
> +	depends on SYSFS && (IPV6 || IPV6=n)
>  	select CONFIGFS_FS
> -	select SYSFS
>  	select IP_SCTP if DLM_SCTP
>  	help
>  	A general purpose distributed lock manager for kernel or userspace
> 


  parent reply	other threads:[~2007-01-29  9:09 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-28  7:49 2.6.20-rc6-mm1 Andrew Morton
2007-01-28 10:08 ` Unable to select IPV6 [Was: 2.6.20-rc6-mm1] Jiri Slaby
2007-01-28 16:19   ` [-mm patch] fix GFS2 circular dependency Adrian Bunk
2007-01-29  1:55     ` Randy Dunlap
2007-01-29  9:12     ` Steven Whitehouse [this message]
2007-01-28 10:25 ` 2.6.20-rc6-mm1 Jiri Slaby
2007-01-30  7:27   ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-30 19:30     ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-30 20:10       ` 2.6.20-rc6-mm1 Jiri Slaby
2007-01-30 20:22       ` 2.6.20-rc6-mm1 Pierre Ossman
2007-01-30 20:50       ` 2.6.20-rc6-mm1 Anton Altaparmakov
2007-01-28 11:01 ` elevator oops [Was: 2.6.20-rc6-mm1] Jiri Slaby
2007-01-28 17:41   ` Jiri Slaby
2007-02-05 11:54   ` Jens Axboe
2007-01-28 14:59 ` 2.6.20-rc6-mm1: linker error with arch_setup_additional_pages thunder7
2007-01-28 16:56 ` 2.6.20-rc6-mm1 Martin J. Bligh
2007-01-28 23:01   ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-28 23:23     ` 2.6.20-rc6-mm1 Martin J. Bligh
2007-01-28 23:38       ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-30  2:42     ` 2.6.20-rc6-mm1 Suparna Bhattacharya
2007-01-30  2:42       ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-30  3:26         ` 2.6.20-rc6-mm1 Martin Bligh
2007-01-28 17:02 ` 2.6.20-rc6-mm1 Martin J. Bligh
2007-01-28 17:04 ` 2.6.20-rc6-mm1 Martin J. Bligh
2007-01-28 19:04 ` [-mm patch] fix CONFIG_SATA_SIS=y compile error Adrian Bunk
2007-01-28 19:41 ` 2.6.20-rc6-mm1 (build) Randy Dunlap
2007-01-28 22:21   ` [2.6 patch] NF_CONNTRACK_H323 must depend on (IPV6 || IPV6=n) Adrian Bunk
2007-01-28 23:53     ` David Miller
2007-01-29  0:00       ` Adrian Bunk
2007-01-29  0:04         ` David Miller
2007-01-29  0:21           ` Adrian Bunk
2007-01-29  1:22             ` Randy Dunlap
2007-01-30 17:13             ` Patrick McHardy
2007-01-28 22:31 ` 2.6.20-rc6-mm1 Michal Piotrowski
2007-01-28 23:10   ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-29  5:17   ` 2.6.20-rc6-mm1 Herbert Xu
2007-01-29  5:29     ` 2.6.20-rc6-mm1 Herbert Xu
2007-01-29  6:43       ` 2.6.20-rc6-mm1 Andrew Morton
2007-01-29  7:21         ` 2.6.20-rc6-mm1 Herbert Xu
2007-01-29  8:35           ` 2.6.20-rc6-mm1 Ingo Molnar
2007-01-29  2:50 ` [PATCH -mm] fix DocBook build Don Mullis
2007-01-30  1:11 ` [-mm patch] vmi: cleanups Adrian Bunk
2007-01-30  4:56   ` Zachary Amsden
2007-01-30  1:11 ` [-mm patch] cx88-video.c: remove struct radionorms Adrian Bunk
2007-01-30  1:11 ` [RFC: -mm patch] CONFIG_INPUT_DEBUG improvements Adrian Bunk
2007-01-30 15:07   ` Jiri Kosina
2007-01-30 15:13     ` Adrian Bunk
2007-01-30  1:11 ` [-mm patch] drivers/char/pcmcia/ipwireless_cs_*: possible cleanups Adrian Bunk
2007-01-30  1:12 ` [RFC: -mm patch] #if 0 v4l_printk_ioctl_arg() Adrian Bunk
2007-02-06 22:12 ` [-mm patch] fs/proc/: make code static Adrian Bunk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1170061928.11001.140.camel@quoit.chygwyn.com \
    --to=swhiteho@redhat.com \
    --cc=akpm@osdl.org \
    --cc=bunk@stusta.de \
    --cc=cluster-devel@redhat.com \
    --cc=jirislaby@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    --subject='Re: [-mm patch] fix GFS2 circular dependency' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).