* [PATCH] Fix CONFIGFS_FS -> select SYSFS recursive dependencies
@ 2011-01-15 23:16 Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS Nicholas A. Bellinger
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-15 23:16 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, linux-fsdevel, Joel Becker, Randy Dunlap,
Stephen Rothwell, James Bottomley, Nicholas Bellinger
From: Nicholas Bellinger <nab@linux-iscsi.org>
Hi again Linus,
Along with the jlbec ACK'ed CONFIGFS_FS -> select SYSFS patch for .38-rc1
sent earlier today here:
configfs: change depends -> select SYSFS
http://marc.info/?l=linux-scsi&m=129512586329785&w=2
the following patches are required to correct three additional recursive
dependencies for CONFIGFS_FS -> select SYSFS found during this afternoon's
lio-core-2.6.git/linus-38-rc1 defconfig build. These appear to be straight
forward enough changes to merge..
Joel & Randy, are these OK with you..?
Thanks,
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@suse.de>
Nicholas Bellinger (3):
net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS
dlm: Make DLM depend on CONFIGFS_FS
ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
drivers/net/Kconfig | 3 +--
fs/dlm/Kconfig | 3 +--
fs/ocfs2/Kconfig | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS
2011-01-15 23:16 [PATCH] Fix CONFIGFS_FS -> select SYSFS recursive dependencies Nicholas A. Bellinger
@ 2011-01-15 23:16 ` Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] dlm: Make DLM " Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] ocfs2: Make OCFS2_FS " Nicholas A. Bellinger
2 siblings, 0 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-15 23:16 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, linux-fsdevel, Joel Becker, Randy Dunlap,
Stephen Rothwell, James Bottomley, Nicholas Bellinger
From: Nicholas Bellinger <nab@linux-iscsi.org>
This patch fixes the following kconfig error after changing
CONFIGFS_FS -> select SYSFS:
fs/sysfs/Kconfig:1:error: recursive dependency detected!
fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS
fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by NETCONSOLE_DYNAMIC
drivers/net/Kconfig:3390: symbol NETCONSOLE_DYNAMIC depends on SYSFS
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@suse.de>
---
drivers/net/Kconfig | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4c8bfc9..16fe4f9 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3389,8 +3389,7 @@ config NETCONSOLE
config NETCONSOLE_DYNAMIC
bool "Dynamic reconfiguration of logging targets"
- depends on NETCONSOLE && SYSFS
- select CONFIGFS_FS
+ depends on NETCONSOLE && SYSFS && CONFIGFS_FS
help
This option enables the ability to dynamically reconfigure target
parameters (interface, IP addresses, port numbers, MAC addresses)
--
1.5.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] dlm: Make DLM depend on CONFIGFS_FS
2011-01-15 23:16 [PATCH] Fix CONFIGFS_FS -> select SYSFS recursive dependencies Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS Nicholas A. Bellinger
@ 2011-01-15 23:16 ` Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] ocfs2: Make OCFS2_FS " Nicholas A. Bellinger
2 siblings, 0 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-15 23:16 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, linux-fsdevel, Joel Becker, Randy Dunlap,
Stephen Rothwell, James Bottomley, Nicholas Bellinger
From: Nicholas Bellinger <nab@linux-iscsi.org>
This patch fixes the following kconfig error after changing
CONFIGFS_FS -> select SYSFS:
fs/sysfs/Kconfig:1:error: recursive dependency detected!
fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS
fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by DLM
fs/dlm/Kconfig:1: symbol DLM depends on SYSFS
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@suse.de>
---
fs/dlm/Kconfig | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 2dbb422..1897eb1 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,8 +1,7 @@
menuconfig DLM
tristate "Distributed Lock Manager (DLM)"
depends on EXPERIMENTAL && INET
- depends on SYSFS && (IPV6 || IPV6=n)
- select CONFIGFS_FS
+ depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n)
select IP_SCTP
help
A general purpose distributed lock manager for kernel or userspace
--
1.5.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
2011-01-15 23:16 [PATCH] Fix CONFIGFS_FS -> select SYSFS recursive dependencies Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] dlm: Make DLM " Nicholas A. Bellinger
@ 2011-01-15 23:16 ` Nicholas A. Bellinger
2011-01-18 23:09 ` Joel Becker
2 siblings, 1 reply; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-15 23:16 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, linux-fsdevel, Joel Becker, Randy Dunlap,
Stephen Rothwell, James Bottomley, Nicholas Bellinger
From: Nicholas Bellinger <nab@linux-iscsi.org>
This patch fixes the following kconfig error after changing
CONFIGFS_FS -> select SYSFS:
fs/sysfs/Kconfig:1:error: recursive dependency detected!
fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS
fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by OCFS2_FS
fs/ocfs2/Kconfig:1: symbol OCFS2_FS depends on SYSFS
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: James Bottomley <James.Bottomley@suse.de>
---
fs/ocfs2/Kconfig | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig
index ab152c0..77a8de5 100644
--- a/fs/ocfs2/Kconfig
+++ b/fs/ocfs2/Kconfig
@@ -1,7 +1,6 @@
config OCFS2_FS
tristate "OCFS2 file system support"
- depends on NET && SYSFS
- select CONFIGFS_FS
+ depends on NET && SYSFS && CONFIGFS_FS
select JBD2
select CRC32
select QUOTA
--
1.5.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
2011-01-15 23:16 ` [PATCH] ocfs2: Make OCFS2_FS " Nicholas A. Bellinger
@ 2011-01-18 23:09 ` Joel Becker
2011-01-18 23:39 ` Nicholas A. Bellinger
0 siblings, 1 reply; 6+ messages in thread
From: Joel Becker @ 2011-01-18 23:09 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: Linus Torvalds, linux-kernel, linux-fsdevel, Randy Dunlap,
Stephen Rothwell, James Bottomley
On Sat, Jan 15, 2011 at 03:16:10PM -0800, Nicholas A. Bellinger wrote:
> From: Nicholas Bellinger <nab@linux-iscsi.org>
>
> This patch fixes the following kconfig error after changing
> CONFIGFS_FS -> select SYSFS:
>
> fs/sysfs/Kconfig:1:error: recursive dependency detected!
> fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS
> fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by OCFS2_FS
> fs/ocfs2/Kconfig:1: symbol OCFS2_FS depends on SYSFS
<snip>
> diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig
> index ab152c0..77a8de5 100644
> --- a/fs/ocfs2/Kconfig
> +++ b/fs/ocfs2/Kconfig
> @@ -1,7 +1,6 @@
> config OCFS2_FS
> tristate "OCFS2 file system support"
> - depends on NET && SYSFS
> - select CONFIGFS_FS
> + depends on NET && SYSFS && CONFIGFS_FS
Isn't this exactly what Linus just said not to do? I don't want
to know that I need to select configfs. Shouldn't it instead just be:
select NET
select CONFIGFS_FS
Linus?
Joel
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
2011-01-18 23:09 ` Joel Becker
@ 2011-01-18 23:39 ` Nicholas A. Bellinger
0 siblings, 0 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-18 23:39 UTC (permalink / raw)
To: Joel Becker
Cc: Linus Torvalds, linux-kernel, linux-fsdevel, Randy Dunlap,
Stephen Rothwell, James Bottomley
On Tue, 2011-01-18 at 23:09 +0000, Joel Becker wrote:
> On Sat, Jan 15, 2011 at 03:16:10PM -0800, Nicholas A. Bellinger wrote:
> > From: Nicholas Bellinger <nab@linux-iscsi.org>
> >
> > This patch fixes the following kconfig error after changing
> > CONFIGFS_FS -> select SYSFS:
> >
> > fs/sysfs/Kconfig:1:error: recursive dependency detected!
> > fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS
> > fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by OCFS2_FS
> > fs/ocfs2/Kconfig:1: symbol OCFS2_FS depends on SYSFS
>
> <snip>
>
> > diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig
> > index ab152c0..77a8de5 100644
> > --- a/fs/ocfs2/Kconfig
> > +++ b/fs/ocfs2/Kconfig
> > @@ -1,7 +1,6 @@
> > config OCFS2_FS
> > tristate "OCFS2 file system support"
> > - depends on NET && SYSFS
> > - select CONFIGFS_FS
> > + depends on NET && SYSFS && CONFIGFS_FS
>
> Isn't this exactly what Linus just said not to do? I don't want
> to know that I need to select configfs. Shouldn't it instead just be:
>
> select NET
> select CONFIGFS_FS
>
Sorry, your are completely correct here. The following three patches
have been commited to lio-core-2-6.git/linus-38-rc1 to change
NETCONSOLE_DYNAMIC, DLM, and OCFS2_FS from:
'depends ... && SYSFS && CONFIGFS'
to:
'select CONFIGFS'
and queued into scsi-post-merge-2.6.git/for-linus to fix this in
mainline. Linus, please review and pull:
git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-linus
Thanks,
Nicholas Bellinger (3):
net: Make NETCONSOLE_DYNAMIC use select CONFIGFS_FS
dlm: Make DLM use select CONFIGFS_FS
ocfs2: Make OCFS2_FS use select CONFIGFS_FS
drivers/net/Kconfig | 3 ++-
fs/dlm/Kconfig | 4 ++--
fs/ocfs2/Kconfig | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
--------------------------------------------------------------------
[PATCH 1/3] net: Make NETCONSOLE_DYNAMIC use select CONFIGFS_FS
Convert 'depends && SYSFS && CONFIGFS_FS' to 'select CONFIGFS_FS'
Reported-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
(cherry picked from commit ee09e61057145bb2389c26632cf3dc2a50f19f69)
---
drivers/net/Kconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 16fe4f9..d573029 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3389,7 +3389,8 @@ config NETCONSOLE
config NETCONSOLE_DYNAMIC
bool "Dynamic reconfiguration of logging targets"
- depends on NETCONSOLE && SYSFS && CONFIGFS_FS
+ depends on NETCONSOLE
+ select CONFIGFS_FS
help
This option enables the ability to dynamically reconfigure target
parameters (interface, IP addresses, port numbers, MAC addresses)
--
1.7.3.5
-------------------------------------------------------------------
[PATCH 2/3] dlm: Make DLM use select CONFIGFS_FS
Convert 'depends && SYSFS && CONFIGFS_FS' to 'select CONFIGFS_FS'
Reported-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
(cherry picked from commit 5eae59520b635dc8bc181acd7234736543841bb7)
---
fs/dlm/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index 1897eb1..4f65a50 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -1,7 +1,7 @@
menuconfig DLM
tristate "Distributed Lock Manager (DLM)"
- depends on EXPERIMENTAL && INET
- depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n)
+ depends on EXPERIMENTAL && INET && (IPV6 || IPV6=n)
+ select CONFIGFS_FS
select IP_SCTP
help
A general purpose distributed lock manager for kernel or userspace
--
1.7.3.5
--------------------------------------------------------------------
[PATCH 3/3] ocfs2: Make OCFS2_FS use select CONFIGFS_FS
Convert 'depends && SYSFS && CONFIGFS_FS' to 'select CONFIGFS_FS'
Reported-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
(cherry picked from commit c424fe33d264fa6f30b55435975ee52a5a165d75)
---
fs/ocfs2/Kconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig
index 77a8de5..bb03131 100644
--- a/fs/ocfs2/Kconfig
+++ b/fs/ocfs2/Kconfig
@@ -1,6 +1,7 @@
config OCFS2_FS
tristate "OCFS2 file system support"
- depends on NET && SYSFS && CONFIGFS_FS
+ depends on NET
+ select CONFIGFS_FS
select JBD2
select CRC32
select QUOTA
--
1.7.3.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-18 23:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-15 23:16 [PATCH] Fix CONFIGFS_FS -> select SYSFS recursive dependencies Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] dlm: Make DLM " Nicholas A. Bellinger
2011-01-15 23:16 ` [PATCH] ocfs2: Make OCFS2_FS " Nicholas A. Bellinger
2011-01-18 23:09 ` Joel Becker
2011-01-18 23:39 ` Nicholas A. Bellinger
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).