Commit 6e936d3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (28 commits)
  kbuild: add distclean info to 'make help' and more details for 'clean'
  dontdiff: add utsrelease.h
  kbuild: fix "mkdir -p" usage in scripts/package/mkspec
  kbuild: correct and clarify versioning info in Makefile
  kbuild: fixup Documentation/kbuild/modules.txt
  kbuild: Extend kbuild/defconfig tags support to exuberant ctags
  kbuild: fix for some typos in Documentation/makefiles.txt
  kbuild: clarify "make C=" build option
  Documentaion: update Documentation/Changes with minimum versions
  kbuild: update help in top level Makefile
  kbuild: fail kernel compilation in case of unresolved module symbols
  kbuild: remove debug left-over from Makefile.host
  kbuild: create output directory for hostprogs with O=.. build
  kbuild: add missing return statement in modpost.c:secref_whitelist()
  kbuild: preperly align SYSMAP output
  kbuild: make -rR is now default
  kbuild: make V=2 tell why a target is rebuild
  kbuild: modpost on vmlinux regardless of CONFIG_MODULES
  kbuild: ignore references from ".pci_fixup" to ".init.text"
  kbuild: linguistic fixes for Documentation/kbuild/makefiles.txt
  ...
parents a68aa1cc 5cc8d246

Documentation/Changes

+3 −4
Original line number Diff line number Diff line
@@ -37,15 +37,14 @@ o e2fsprogs 1.29 # tune2fs 
o  jfsutils               1.1.3                   # fsck.jfs -V

o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs

o  xfsprogs               2.6.0                   # xfs_db -V

o  pcmciautils            004

o  pcmcia-cs              3.1.21                  # cardmgr -V

o  pcmciautils            004                     # pccardctl -V

o  quota-tools            3.09                    # quota -V

o  PPP                    2.4.0                   # pppd --version

o  isdn4k-utils           3.1pre1                 # isdnctrl 2>&1|grep version

o  nfs-utils              1.0.5                   # showmount --version

o  procps                 3.2.0                   # ps --version

o  oprofile               0.9                     # oprofiled --version

o  udev                   071                     # udevinfo -V

o  udev                   081                     # udevinfo -V



Kernel compilation

==================
@@ -268,7 +267,7 @@ active clients. 


To enable this new functionality, you need to:



  mount -t nfsd nfsd /proc/fs/nfs

  mount -t nfsd nfsd /proc/fs/nfsd



before running exportfs or mountd.  It is recommended that all NFS

services be protected from the internet-at-large by a firewall where

Documentation/dontdiff

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ tags 
times.h*

tkparse

trix_boot.h

utsrelease.h*

version.h*

vmlinux

vmlinux-*

Documentation/kbuild/kconfig-language.txt

+6 −6
Original line number Diff line number Diff line
@@ -67,19 +67,19 @@ applicable everywhere (see syntax). 
- default value: "default" <expr> ["if" <expr>]

  A config option can have any number of default values. If multiple

  default values are visible, only the first defined one is active.

  Default values are not limited to the menu entry, where they are

  defined, this means the default can be defined somewhere else or be

  Default values are not limited to the menu entry where they are

  defined. This means the default can be defined somewhere else or be

  overridden by an earlier definition.

  The default value is only assigned to the config symbol if no other

  value was set by the user (via the input prompt above). If an input

  prompt is visible the default value is presented to the user and can

  be overridden by him.

  Optionally dependencies only for this default value can be added with

  Optionally, dependencies only for this default value can be added with

  "if".



- dependencies: "depends on"/"requires" <expr>

  This defines a dependency for this menu entry. If multiple

  dependencies are defined they are connected with '&&'. Dependencies

  dependencies are defined, they are connected with '&&'. Dependencies

  are applied to all other options within this menu entry (which also

  accept an "if" expression), so these two examples are equivalent:
@@ -153,7 +153,7 @@ Nonconstant symbols are the most common ones and are defined with the 
'config' statement. Nonconstant symbols consist entirely of alphanumeric

characters or underscores.

Constant symbols are only part of expressions. Constant symbols are

always surrounded by single or double quotes. Within the quote any

always surrounded by single or double quotes. Within the quote, any

other character is allowed and the quotes can be escaped using '\'.



Menu structure
@@ -237,7 +237,7 @@ choices: 
	<choice block>

	"endchoice"



This defines a choice group and accepts any of above attributes as

This defines a choice group and accepts any of the above attributes as

options. A choice can only be of type bool or tristate, while a boolean

choice only allows a single config entry to be selected, a tristate

choice also allows any number of config entries to be set to 'm'. This

Documentation/kbuild/makefiles.txt

+136 −129

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/kbuild/modules.txt

+81 −80

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE