Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits) kconfig: fix mconf segmentation fault kbuild: enable use of code from a different dir kconfig: error out if recursive dependencies are found kbuild: scripts/basic/fixdep segfault on pathological string-o-death kconfig: correct minor typo in Kconfig warning message. kconfig: fix path to modules.txt in Kconfig help usr/Kconfig: fix typo kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs' kbuild: be more explicit on missing .config file kbuild: clarify the creation of the LOCALVERSION_AUTO string. kbuild: propagate errors from find in scripts/gen_initramfs_list.sh kconfig: refer to qt3 if we cannot find qt libraries kbuild: handle compressed cpio initramfs-es kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text kbuild: remove stale comment in modpost.c kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE kbuild: fix make mrproper for Documentation/DocBook/man kbuild: remove kconfig binaries during make mrproper kconfig/menuconfig: do not hardcode '.config' kbuild: override build timestamp & version ...
author: Linus Torvalds <torvalds@woody.linux-foundation.org> 2007-05-06 16:21:57 -0400
committer: Linus Torvalds <torvalds@woody.linux-foundation.org> 2007-05-06 16:21:57 -0400
commit: 15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch)
tree: 7fa2f81c33c9efcb1a1568385beead75c5892cfb /net
parent: 6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff)
parent: 11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff)
3 files changed, 14 insertions, 14 deletions
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index da07e9a88ee9..bbe99f842f9f 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -198,7 +198,7 @@ config IP6_NF_RAW
          and OUTPUT chains.
        
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 endmenu
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index c558f3214255..ea6211cade0a 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -100,7 +100,7 @@ config NF_CT_PROTO_SCTP
          tracking code will be able to do state tracking on SCTP connections.
          If you want to compile it as a module, say M here and read
-          Documentation/modules.txt.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NF_CONNTRACK_AMANDA
        tristate "Amanda backup protocol support"
@@ -279,8 +279,8 @@ config NETFILTER_XT_TARGET_CONNMARK
          affects the connection mark value rather than the packet mark value.
        
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  The module will be called
+          <file:Documentation/kbuild/modules.txt>.  The module will be called
-          ipt_CONNMARK.o.  If unsure, say `N'.
+          ipt_CONNMARK.ko.  If unsure, say `N'.
 config NETFILTER_XT_TARGET_DSCP
        tristate '"DSCP" target support'
@@ -341,7 +341,7 @@ config NETFILTER_XT_TARGET_NOTRACK
          no protocol helpers for the selected packets).
        
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_TARGET_SECMARK
        tristate '"SECMARK" target support'
@@ -397,7 +397,7 @@ config NETFILTER_XT_MATCH_COMMENT
          comments in your iptables ruleset.
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_CONNBYTES
        tristate  '"connbytes" per-connection counter match support'
@@ -409,7 +409,7 @@ config NETFILTER_XT_MATCH_CONNBYTES
          number of bytes and/or packets for each direction within a connection.
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_CONNMARK
        tristate  '"connmark" connection mark match support'
@@ -421,8 +421,8 @@ config NETFILTER_XT_MATCH_CONNMARK
          connection mark value previously set for the session by `CONNMARK'. 
        
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  The module will be called
+          <file:Documentation/kbuild/modules.txt>.  The module will be called
-          ipt_connmark.o.  If unsure, say `N'.
+          ipt_connmark.ko.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_CONNTRACK
        tristate '"conntrack" connection tracking match support'
@@ -446,7 +446,7 @@ config NETFILTER_XT_MATCH_DCCP
          and DCCP flags.
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_DSCP
        tristate '"DSCP" match support'
@@ -565,7 +565,7 @@ config NETFILTER_XT_MATCH_QUOTA
          byte counter.
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_REALM
        tristate  '"realm" match support'
@@ -579,7 +579,7 @@ config NETFILTER_XT_MATCH_REALM
          in tc world.
        
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_SCTP
        tristate  '"sctp" protocol match support (EXPERIMENTAL)'
@@ -590,7 +590,7 @@ config NETFILTER_XT_MATCH_SCTP
          and SCTP chunk types.
          If you want to compile it as a module, say M here and read
-          <file:Documentation/modules.txt>.  If unsure, say `N'.
+          <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
 config NETFILTER_XT_MATCH_STATE
        tristate '"state" match support'
diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig
index 3891cc00087d..f9e367d946eb 100644
--- a/net/tipc/Kconfig
+++ b/net/tipc/Kconfig
@@ -18,7 +18,7 @@ config TIPC
          This protocol support is also available as a module ( = code which
          can be inserted in and removed from the running kernel whenever you
          want). The module will be called tipc. If you want to compile it
-          as a module, say M here and read <file:Documentation/modules.txt>.
+          as a module, say M here and read <file:Documentation/kbuild/modules.txt>.
          If in doubt, say N.
author	Linus Torvalds <torvalds@woody.linux-foundation.org>	2007-05-06 16:21:57 -0400
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>	2007-05-06 16:21:57 -0400
commit	15700770ef7c5d12e2f1659d2ddbeb3f658d9f37 (patch)
tree	7fa2f81c33c9efcb1a1568385beead75c5892cfb /net
parent	6de410c2b0cc055ae9ee640c84331f6a70878d9b (diff)
parent	11de39e2fbbc592018e0a231d0ee773653dcc8d6 (diff)

diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index da07e9a88ee9..bbe99f842f9f 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig
@@ -198,7 +198,7 @@ config IP6_NF_RAW
198	and OUTPUT chains.	198	and OUTPUT chains.
199		199
200	If you want to compile it as a module, say M here and read	200	If you want to compile it as a module, say M here and read
201	<file:Documentation/modules.txt>. If unsure, say `N'.	201	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
202		202
203	endmenu	203	endmenu
204		204


diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index c558f3214255..ea6211cade0a 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig
@@ -100,7 +100,7 @@ config NF_CT_PROTO_SCTP
100	tracking code will be able to do state tracking on SCTP connections.	100	tracking code will be able to do state tracking on SCTP connections.
101		101
102	If you want to compile it as a module, say M here and read	102	If you want to compile it as a module, say M here and read
103	Documentation/modules.txt. If unsure, say `N'.	103	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
104		104
105	config NF_CONNTRACK_AMANDA	105	config NF_CONNTRACK_AMANDA
106	tristate "Amanda backup protocol support"	106	tristate "Amanda backup protocol support"
@@ -279,8 +279,8 @@ config NETFILTER_XT_TARGET_CONNMARK
279	affects the connection mark value rather than the packet mark value.	279	affects the connection mark value rather than the packet mark value.
280		280
281	If you want to compile it as a module, say M here and read	281	If you want to compile it as a module, say M here and read
282	<file:Documentation/modules.txt>. The module will be called	282	<file:Documentation/kbuild/modules.txt>. The module will be called
283	ipt_CONNMARK.o. If unsure, say `N'.	283	ipt_CONNMARK.ko. If unsure, say `N'.
284		284
285	config NETFILTER_XT_TARGET_DSCP	285	config NETFILTER_XT_TARGET_DSCP
286	tristate '"DSCP" target support'	286	tristate '"DSCP" target support'
@@ -341,7 +341,7 @@ config NETFILTER_XT_TARGET_NOTRACK
341	no protocol helpers for the selected packets).	341	no protocol helpers for the selected packets).
342		342
343	If you want to compile it as a module, say M here and read	343	If you want to compile it as a module, say M here and read
344	<file:Documentation/modules.txt>. If unsure, say `N'.	344	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
345		345
346	config NETFILTER_XT_TARGET_SECMARK	346	config NETFILTER_XT_TARGET_SECMARK
347	tristate '"SECMARK" target support'	347	tristate '"SECMARK" target support'
@@ -397,7 +397,7 @@ config NETFILTER_XT_MATCH_COMMENT
397	comments in your iptables ruleset.	397	comments in your iptables ruleset.
398		398
399	If you want to compile it as a module, say M here and read	399	If you want to compile it as a module, say M here and read
400	<file:Documentation/modules.txt>. If unsure, say `N'.	400	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
401		401
402	config NETFILTER_XT_MATCH_CONNBYTES	402	config NETFILTER_XT_MATCH_CONNBYTES
403	tristate '"connbytes" per-connection counter match support'	403	tristate '"connbytes" per-connection counter match support'
@@ -409,7 +409,7 @@ config NETFILTER_XT_MATCH_CONNBYTES
409	number of bytes and/or packets for each direction within a connection.	409	number of bytes and/or packets for each direction within a connection.
410		410
411	If you want to compile it as a module, say M here and read	411	If you want to compile it as a module, say M here and read
412	<file:Documentation/modules.txt>. If unsure, say `N'.	412	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
413		413
414	config NETFILTER_XT_MATCH_CONNMARK	414	config NETFILTER_XT_MATCH_CONNMARK
415	tristate '"connmark" connection mark match support'	415	tristate '"connmark" connection mark match support'
@@ -421,8 +421,8 @@ config NETFILTER_XT_MATCH_CONNMARK
421	connection mark value previously set for the session by `CONNMARK'.	421	connection mark value previously set for the session by `CONNMARK'.
422		422
423	If you want to compile it as a module, say M here and read	423	If you want to compile it as a module, say M here and read
424	<file:Documentation/modules.txt>. The module will be called	424	<file:Documentation/kbuild/modules.txt>. The module will be called
425	ipt_connmark.o. If unsure, say `N'.	425	ipt_connmark.ko. If unsure, say `N'.
426		426
427	config NETFILTER_XT_MATCH_CONNTRACK	427	config NETFILTER_XT_MATCH_CONNTRACK
428	tristate '"conntrack" connection tracking match support'	428	tristate '"conntrack" connection tracking match support'
@@ -446,7 +446,7 @@ config NETFILTER_XT_MATCH_DCCP
446	and DCCP flags.	446	and DCCP flags.
447		447
448	If you want to compile it as a module, say M here and read	448	If you want to compile it as a module, say M here and read
449	<file:Documentation/modules.txt>. If unsure, say `N'.	449	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
450		450
451	config NETFILTER_XT_MATCH_DSCP	451	config NETFILTER_XT_MATCH_DSCP
452	tristate '"DSCP" match support'	452	tristate '"DSCP" match support'
@@ -565,7 +565,7 @@ config NETFILTER_XT_MATCH_QUOTA
565	byte counter.	565	byte counter.
566		566
567	If you want to compile it as a module, say M here and read	567	If you want to compile it as a module, say M here and read
568	<file:Documentation/modules.txt>. If unsure, say `N'.	568	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
569		569
570	config NETFILTER_XT_MATCH_REALM	570	config NETFILTER_XT_MATCH_REALM
571	tristate '"realm" match support'	571	tristate '"realm" match support'
@@ -579,7 +579,7 @@ config NETFILTER_XT_MATCH_REALM
579	in tc world.	579	in tc world.
580		580
581	If you want to compile it as a module, say M here and read	581	If you want to compile it as a module, say M here and read
582	<file:Documentation/modules.txt>. If unsure, say `N'.	582	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
583		583
584	config NETFILTER_XT_MATCH_SCTP	584	config NETFILTER_XT_MATCH_SCTP
585	tristate '"sctp" protocol match support (EXPERIMENTAL)'	585	tristate '"sctp" protocol match support (EXPERIMENTAL)'
@@ -590,7 +590,7 @@ config NETFILTER_XT_MATCH_SCTP
590	and SCTP chunk types.	590	and SCTP chunk types.
591		591
592	If you want to compile it as a module, say M here and read	592	If you want to compile it as a module, say M here and read
593	<file:Documentation/modules.txt>. If unsure, say `N'.	593	<file:Documentation/kbuild/modules.txt>. If unsure, say `N'.
594		594
595	config NETFILTER_XT_MATCH_STATE	595	config NETFILTER_XT_MATCH_STATE
596	tristate '"state" match support'	596	tristate '"state" match support'


diff --git a/net/tipc/Kconfig b/net/tipc/Kconfig index 3891cc00087d..f9e367d946eb 100644 --- a/net/tipc/Kconfig +++ b/net/tipc/Kconfig
@@ -18,7 +18,7 @@ config TIPC
18	This protocol support is also available as a module ( = code which	18	This protocol support is also available as a module ( = code which
19	can be inserted in and removed from the running kernel whenever you	19	can be inserted in and removed from the running kernel whenever you
20	want). The module will be called tipc. If you want to compile it	20	want). The module will be called tipc. If you want to compile it
21	as a module, say M here and read <file:Documentation/modules.txt>.	21	as a module, say M here and read <file:Documentation/kbuild/modules.txt>.
22		22
23	If in doubt, say N.	23	If in doubt, say N.
24		24