documentation patch queue for 2.6.35 merge window
Subsystems (5)
cover documentation patch queue for 2.6.35 merge window
This is my current documentation patch queue for the 2.6.35 merge window. Other maintainers are welcome to cherry pick any of these for merging if desired.
PATCH 1/10 docbook: make mtd nand module init static
From: H Hartley Sweeten <[email protected]>
In the example the module_init function should be static.
--- Documentation/DocBook/mtdnand.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/DocBook/mtdnand.tmpl +1 -1
@@ -269,7 +269,7 @@ static void board_hwcontrol(struct mtd_i information about the device. </para> <programlisting> -int __init board_init (void) +static int __init board_init (void) { struct nand_chip *this; int err = 0;
PATCH 2/10 Documentation/development-process: add maintainers and git info
In reply to Randy DunlapFrom: Randy Dunlap <[email protected]>
Add info on maintainers and persistent posting.
Update git home page.
--- Documentation/development-process/2.Process | 15 ++++++++--- Documentation/development-process/7.AdvancedTopics | 2 - 2 files changed, 13 insertions(+), 4 deletions(-)
Documentation/development-process/2.Process +12 -3
@@ -151,7 +151,7 @@ The stages that a patch goes through are well. - Wider review. When the patch is getting close to ready for mainline - inclusion, it will be accepted by a relevant subsystem maintainer - + inclusion, it should be accepted by a relevant subsystem maintainer - though this acceptance is not a guarantee that the patch will make it all the way to the mainline. The patch will show up in the maintainer's subsystem tree and into the staging trees (described below). When the
@@ -159,6 +159,15 @@ The stages that a patch goes through are the discovery of any problems resulting from the integration of this patch with work being done by others. +- Please note that most maintainers also have day jobs, so merging + your patch may not be their highest priority. If your patch is + getting feedback about changes that are needed, you should either + make those changes or justify why they should not be made. If your + patch has no review complaints but is not being merged by its + appropriate subsystem or driver maintainer, you should be persistent + in updating the patch to the current kernel so that it applies cleanly + and keep sending it for review and merging. + - Merging into the mainline. Eventually, a successful patch will be merged into the mainline repository managed by Linus Torvalds. More comments and/or problems may surface at this time; it is important that
@@ -319,9 +328,9 @@ developers; even if they do not use it f to keep up with what other developers (and the mainline) are doing. Git is now packaged by almost all Linux distributions. There is a home -page at +page at: - http://git.or.cz/ + http://git-scm.com/ That page has pointers to documentation and tutorials. One should be aware, in particular, of the Kernel Hacker's Guide to git, which has
Documentation/development-process/7.AdvancedTopics +1 -1
@@ -25,7 +25,7 @@ long document in its own right. Instead fits into the kernel development process in particular. Developers who wish to come up to speed with git will find more information at: - http://git.or.cz/ + http://git-scm.com/ http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
PATCH 3/10 Documentation/development-process: add staging & mmotm info
In reply to Randy DunlapFrom: Randy Dunlap <[email protected]>
Update explanation of mmotm.
Add explanation of drivers/staging/.
--- Documentation/development-process/2.Process | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Documentation/development-process/2.Process +8 -6
@@ -267,12 +267,8 @@ an appropriate subsystem tree or be sent development cycle, approximately 10% of the patches going into the mainline get there via -mm. -The current -mm patch can always be found from the front page of - - http://kernel.org/ - -Those who want to see the current state of -mm can get the "-mm of the -moment" tree, found at: +The current -mm patch is available in the "mmotm" (-mm of the moment) +directory at: http://userweb.kernel.org/~akpm/mmotm/
@@ -307,6 +303,12 @@ volatility of linux-next tends to make i See http://lwn.net/Articles/289013/ for more information on this topic, and stay tuned; much is still in flux where linux-next is involved. +Besides the mmotm and linux-next trees, the kernel source tree now contains +the drivers/staging/ directory and many sub-directories for drivers or +filesystems that are on their way to being added to the kernel tree +proper, but they remain in drivers/staging/ while they still need more +work. + 2.5: TOOLS
PATCH 4/10 Documentation/sysrq.txt: update KEY_SYSRQ info
In reply to Randy DunlapFrom: Paul Fox <[email protected]>
While setting up sysrq operation on the XO laptop (which lacks a SysRq key), i realized that the documentation was quite out of date.
Change documentation of SysRq to reflect current KEY_SYSRQ value.
--- Documentation/sysrq.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
Documentation/sysrq.txt +7 -7
@@ -177,13 +177,13 @@ virtual console (ALT+Fn) and then back a * I hit SysRq, but nothing seems to happen, what's wrong? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -There are some keyboards that send different scancodes for SysRq than the -pre-defined 0x54. So if SysRq doesn't work out of the box for a certain -keyboard, run 'showkey -s' to find out the proper scancode sequence. Then -use 'setkeycodes <sequence> 84' to define this sequence to the usual SysRq -code (84 is decimal for 0x54). It's probably best to put this command in a -boot script. Oh, and by the way, you exit 'showkey' by not typing anything -for ten seconds. +There are some keyboards that produce a different keycode for SysRq than the +pre-defined value of 99 (see KEY_SYSRQ in include/linux/input.h), or which +don't have a SysRq key at all. In these cases, run 'showkey -s' to find an +appropriate scancode sequence, and use 'setkeycodes <sequence> 99' to map +this sequence to the usual SysRq code (e.g., 'setkeycodes e05b 99'). It's +probably best to put this command in a boot script. Oh, and by the way, you +exit 'showkey' by not typing anything for ten seconds. * I want to add SysRQ key events to a module, how does it work? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PATCH 5/10 Documentation/timers/hpet_example: drop duplicate header files
In reply to Randy DunlapFrom: Andrea Gelmini <[email protected]>
Documentation/timers/hpet_example.c: fcntl.h is included more than once. Documentation/timers/hpet_example.c: signal.h is included more than once.
--- Documentation/timers/hpet_example.c | 2 -- 1 file changed, 2 deletions(-)
Documentation/timers/hpet_example.c +0 -2
@@ -10,7 +10,6 @@#include <sys/types.h> #include <sys/wait.h> #include <signal.h> -#include <fcntl.h> #include <errno.h> #include <sys/time.h> #include <linux/hpet.h>
@@ -24,7 +23,6 @@ extern void hpet_read(int, const char **#include <sys/poll.h> #include <sys/ioctl.h> -#include <signal.h> struct hpet_command {char *command;
PATCH 6/10 Documentation/vm: use better value for MAP_HUGETLB
In reply to Randy DunlapFrom: Carlo Marcelo Arenas Belon <[email protected]>
documentation: slightly more correct value for MAP_HUGETLB in map_hugetlb.c
still not correct for alpha, mips, parisc or xtensa but working out of the box in the most common architectures without having to deal with complicated macros or including architecture specific headers.
--- Documentation/vm/map_hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/vm/map_hugetlb.c +1 -1
@@ -19,7 +19,7 @@#define PROTECTION (PROT_READ | PROT_WRITE)#ifndef MAP_HUGETLB -#define MAP_HUGETLB 0x40 +#define MAP_HUGETLB 0x40000/* arch specific */ #endif /* Only ia64 requires this */
PATCH 7/10 scsi: update torque.net references to current location
In reply to Randy DunlapFrom: Randy Dunlap <[email protected]>
Change torque.net references for SCSI drivers & tools to their current locations (sg.danny.cz/sg). Remove whitespace at ends of lines.
Same could be done for parport references at torque.net except that those files don't seem to have a home now.
--- .mailmap | 2 Documentation/DocBook/scsi.tmpl | 2 Documentation/scsi/scsi-generic.txt | 30 ++--- Documentation/scsi/scsi.txt | 22 +-- Documentation/scsi/scsi_mid_low_api.txt | 130 +++++++++++----------- MAINTAINERS | 2 drivers/scsi/Kconfig | 4 drivers/scsi/scsi_debug.c | 2 include/scsi/sg.h | 19 +-- 9 files changed, 107 insertions(+), 106 deletions(-)
.mailmap +1 -1
@@ -34,7 +34,7 @@ David Brownell <[email protected]> David Woodhouse <[email protected]> Dmitry Eremin-Solenikov <[email protected]> Domen Puncer <[email protected]> -Douglas Gilbert <[email protected]> +Douglas Gilbert <[email protected]> Ed L. Cashin <[email protected]> Evgeniy Polyakov <[email protected]> Felipe W Damasio <[email protected]>
MAINTAINERS +1 -1
@@ -4860,7 +4860,7 @@ F: drivers/scsi/sr* SCSI SG DRIVER M: Doug Gilbert <[email protected]> L: [email protected] -W: http://www.torque.net/sg +W: http://sg.danny.cz/sg/index.html S: Maintained F: drivers/scsi/sg.c F: include/scsi/sg.h
include/scsi/sg.h +10 -9
@@ -16,7 +16,7 @@ Version 2 and 3 extensions to driver: Version: 3.5.34 (20060920) This version is for 2.6 series kernels. - For a full changelog see http://www.torque.net/sg + For a full changelog see http://sg.danny.cz/sg/index.html Map of SG verions to the Linux kernels in which they appear: ---------- ----------------------------------
@@ -44,28 +44,29 @@ Major new features in SG 3.x driver (cf** N.B. To use direct IO 'echo 1 > /proc/scsi/sg/allow_dio' or 'echo 1 > /sys/module/sg/parameters/allow_dio' is needed. That attribute is 0 by default. ** -- Historical note: this SCSI pass-through driver has been known as "sg" for + +Historical note: this SCSI pass-through driver has been known as "sg" for a decade. In broader kernel discussions "sg" is used to refer to scatter gather techniques. The context should clarify which "sg" is referred to. Documentation ============= A web site for the SG device driver can be found at: -http://www.torque.net/sg [alternatively check the MAINTAINERS file] +http://sg.danny.cz/sg/index.html +[alternatively check the MAINTAINERS file] The documentation for the sg version 3 driver can be found at: -http://www.torque.net/sg/p/sg_v3_ho.html +http://sg.danny.cz/sg/p/scsi-generic_v3.txt This is a rendering from DocBook source [change the extension to "sgml" or "xml"]. There are renderings in "ps", "pdf", "rtf" and "txt" (soon). The SG_IO ioctl is now found in other parts kernel (e.g. the block layer). -For more information see http://www.torque.net/sg/sg_io.html +For more information see http://sg.danny.cz/sg/sg_io.html The older, version 2 documents discuss the original sg interface in detail: -http://www.torque.net/sg/p/scsi-generic.txt -http://www.torque.net/sg/p/scsi-generic_long.txt +http://sg.danny.cz/sg/p/scsi-generic.txt +http://sg.danny.cz/sg/p/scsi-generic_long.txt Also available: <kernel_source>/Documentation/scsi/scsi-generic.txt -Utility and test programs are available at the sg web site. They are +Utility and test programs are available at the sg web site. They are packaged as sg3_utils (for the lk 2.4 and 2.6 series) and sg_utils (for the lk 2.2 series). */
drivers/scsi/Kconfig +2 -2
@@ -1600,8 +1600,8 @@ config SCSI_DEBUG each with multiple dummy SCSI devices (disks). It defaults to one host adapter with one dummy SCSI disk. Each dummy disk uses kernel RAM as storage (i.e. it is a ramdisk). To save space when multiple - dummy disks are simulated, they share the same kernel RAM for - their storage. See <http://www.torque.net/sg/sdebug.html> for more + dummy disks are simulated, they share the same kernel RAM for + their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more information. This driver is primarily of use to those testing the SCSI and block subsystems. If unsure, say N.
drivers/scsi/scsi_debug.c +1 -1
@@ -12,7 +12,7 @@* SAS disks. * * -* For documentation see http://www.torque.net/sg/sdebug26.html +* For documentation see http://sg.danny.cz/sg/sdebug26.html * * D. Gilbert (dpg) work for Magneto-Optical device test [20010421] * dpg: work for devfs large number of disks [20010809]
Documentation/DocBook/scsi.tmpl +1 -1
@@ -393,7 +393,7 @@ </para> <para> For documentation see - <ulink url='http://www.torque.net/sg/sdebug26.html'>http://www.torque.net/sg/sdebug26.html</ulink> + <ulink url='http://sg.danny.cz/sg/sdebug26.html'>http://sg.danny.cz/sg/sdebug26.html</ulink> </para> <!-- !Edrivers/scsi/scsi_debug.c --> </sect2>
Documentation/scsi/scsi.txt +11 -11
@@ -4,38 +4,38 @@ The Linux Documentation Project (LDP) ma the SCSI subsystem in the Linux kernel (lk) 2.4 series. See: http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO . The LDP has single and multiple page HTML renderings as well as postscript and pdf. -It can also be found at http://www.torque.net/scsi/SCSI-2.4-HOWTO . +It can also be found at http://sg.danny.cz/scsi/SCSI-2.4-HOWTO/index.html . Notes on using modules in the SCSI subsystem ============================================ -The scsi support in the linux kernel can be modularized in a number of +The scsi support in the linux kernel can be modularized in a number of different ways depending upon the needs of the end user. To understand your options, we should first define a few terms. -The scsi-core (also known as the "mid level") contains the core of scsi +The scsi-core (also known as the "mid level") contains the core of scsi support. Without it you can do nothing with any of the other scsi drivers. The scsi core support can be a module (scsi_mod.o), or it can be built into -the kernel. If the core is a module, it must be the first scsi module -loaded, and if you unload the modules, it will have to be the last one +the kernel. If the core is a module, it must be the first scsi module +loaded, and if you unload the modules, it will have to be the last one unloaded. In practice the modprobe and rmmod commands (and "autoclean") will enforce the correct ordering of loading and unloading modules in the SCSI subsystem. -The individual upper and lower level drivers can be loaded in any order +The individual upper and lower level drivers can be loaded in any order once the scsi core is present in the kernel (either compiled in or loaded as a module). The disk driver (sd_mod.o), cdrom driver (sr_mod.o), -tape driver ** (st.o) and scsi generics driver (sg.o) represent the upper -level drivers to support the various assorted devices which can be -controlled. You can for example load the tape driver to use the tape drive, +tape driver ** (st.o) and scsi generics driver (sg.o) represent the upper +level drivers to support the various assorted devices which can be +controlled. You can for example load the tape driver to use the tape drive, and then unload it once you have no further need for the driver (and release the associated memory). The lower level drivers are the ones that support the individual cards that are supported for the hardware platform that you are running under. Those individual cards are often called Host Bus Adapters (HBAs). For example the -aic7xxx.o driver is used to control all recent SCSI controller cards from -Adaptec. Almost all lower level drivers can be built either as modules or +aic7xxx.o driver is used to control all recent SCSI controller cards from +Adaptec. Almost all lower level drivers can be built either as modules or built into the kernel.
Documentation/scsi/scsi_mid_low_api.txt +65 -65
408 lines not on this page · raw message
Documentation/scsi/scsi-generic.txt +15 -15
@@ -18,7 +18,7 @@ and examples. Major versions of the sg driver =============================== There are three major versions of sg found in the linux kernel (lk): - - sg version 1 (original) from 1992 to early 1999 (lk 2.2.5) . + - sg version 1 (original) from 1992 to early 1999 (lk 2.2.5) . It is based in the sg_header interface structure. - sg version 2 from lk 2.2.6 in the 2.2 series. It is based on an extended version of the sg_header interface structure.
@@ -29,28 +29,28 @@ There are three major versions of sg fou Sg driver documentation ======================= The most recent documentation of the sg driver is kept at the Linux -Documentation Project's (LDP) site: +Documentation Project's (LDP) site: http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO This describes the sg version 3 driver found in the lk 2.4 series. The LDP renders documents in single and multiple page HTML, postscript and pdf. This document can also be found at: -http://www.torque.net/sg/p/sg_v3_ho.html +http://sg.danny.cz/sg/p/sg_v3_ho.html Documentation for the version 2 sg driver found in the lk 2.2 series can -be found at http://www.torque.net/sg/p/scsi-generic.txt . A larger version -is at: http://www.torque.net/sg/p/scsi-generic_long.txt . +be found at http://sg.danny.cz/sg/p/scsi-generic.txt . A larger version +is at: http://sg.danny.cz/sg/p/scsi-generic_long.txt . The original documentation for the sg driver (prior to lk 2.2.6) can be -found at http://www.torque.net/sg/p/original/SCSI-Programming-HOWTO.txt +found at http://sg.danny.cz/sg/p/original/SCSI-Programming-HOWTO.txt and in the LDP archives. A changelog with brief notes can be found in the -/usr/src/linux/include/scsi/sg.h file. Note that the glibc maintainers copy -and edit this file (removing its changelog for example) before placing it -in /usr/include/scsi/sg.h . Driver debugging information and other notes +/usr/src/linux/include/scsi/sg.h file. Note that the glibc maintainers copy +and edit this file (removing its changelog for example) before placing it +in /usr/include/scsi/sg.h . Driver debugging information and other notes can be found at the top of the /usr/src/linux/drivers/scsi/sg.c file. -A more general description of the Linux SCSI subsystem of which sg is a +A more general description of the Linux SCSI subsystem of which sg is a part can be found at http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO .
@@ -60,8 +60,8 @@ There are two packages of sg utilities: - sg3_utils for the sg version 3 driver found in lk 2.4 - sg_utils for the sg version 2 (and original) driver found in lk 2.2 and earlier -Both packages will work in the lk 2.4 series however sg3_utils offers more -capabilities. They can be found at: http://www.torque.net/sg and +Both packages will work in the lk 2.4 series; however, sg3_utils offers more +capabilities. They can be found at: http://sg.danny.cz/sg/index.html and freshmeat.net Another approach is to look at the applications that use the sg driver.
@@ -73,14 +73,14 @@ Mapping of Linux kernel versions to sg d Here is a list of linux kernels in the 2.4 series that had new version of the sg driver: lk 2.4.0 : sg version 3.1.17 - lk 2.4.7 : sg version 3.1.19 + lk 2.4.7 : sg version 3.1.19 lk 2.4.10 : sg version 3.1.20 ** - lk 2.4.17 : sg version 3.1.22 + lk 2.4.17 : sg version 3.1.22 ** There were 3 changes to sg version 3.1.20 by third parties in the next six linux kernel versions. -For reference here is a list of linux kernels in the 2.2 series that had +For reference here is a list of linux kernels in the 2.2 series that had new version of the sg driver: lk 2.2.0 : original sg version [with no version number] lk 2.2.6 : sg version 2.1.31
PATCH 8/10 scsi_scan.c: fix/convert functions to use kernel-doc
In reply to Randy DunlapFrom: Randy Dunlap <[email protected]>
scsi_scan.c: fix incorrectly formatted kernel-doc notation & convert documentation of 2 functions into kernel-doc.
--- drivers/scsi/scsi_scan.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/scsi/scsi_scan.c +9 -17
@@ -1221,7 +1221,7 @@ static void scsi_sequential_lun_scan(str }/** -* scsilun_to_int: convert a scsi_lun to an int +* scsilun_to_int - convert a scsi_lun to an int * @scsilun: struct scsi_lun to be converted. * * Description:
@@ -1253,7 +1253,7 @@ int scsilun_to_int(struct scsi_lun *scsiEXPORT_SYMBOL (scsilun_to_int);/** -* int_to_scsilun: reverts an int into a scsi_lun +* int_to_scsilun - reverts an int into a scsi_lun * @lun: integer to be reverted * @scsilun: struct scsi_lun to be set. *
@@ -1877,12 +1877,9 @@ void scsi_forget_host(struct Scsi_Host *spin_unlock_irqrestore (shost->host_lock, flags); } -/* -* Function: scsi_get_host_dev() -* -* Purpose: Create a scsi_device that points to the host adapter itself. -* -* Arguments: SHpnt - Host that needs a scsi_device +/** +* scsi_get_host_dev - Create a scsi_device that points to the host adapter itself +* @shost: Host that needs a scsi_device * * Lock status: None assumed. *
@@ -1895,7 +1892,7 @@ void scsi_forget_host(struct Scsi_Host ** * Note - this device is not accessible from any high-level * drivers (including generics), which is probably not -* optimal. We can add hooks later to attach +* optimal. We can add hooks later to attach. */ struct scsi_device *scsi_get_host_dev (struct Scsi_Host *shost) {
@@ -1921,18 +1918,13 @@ struct scsi_device *scsi_get_host_dev(st }EXPORT_SYMBOL (scsi_get_host_dev); -/* -* Function: scsi_free_host_dev() -* -* Purpose: Free a scsi_device that points to the host adapter itself. -* -* Arguments: SHpnt - Host that needs a scsi_device +/** +* scsi_free_host_dev - Free a scsi_device that points to the host adapter itself +* @sdev: Host device to be freed * * Lock status: None assumed. * * Returns: Nothing -* -* Notes: */ void scsi_free_host_dev (struct scsi_device *sdev) {
PATCH 9/10 fusion: fix kernel-doc notation
In reply to Randy DunlapFrom: Ben Hutchings <[email protected]>
The function name must be followed by a space, hypen, space, and a short description.
--- drivers/message/fusion/mptscsih.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/message/fusion/mptscsih.c +2 -4
@@ -2561,9 +2561,7 @@ mptscsih_getclear_scsi_lookup(MPT_ADAPTE }/** -* mptscsih_set_scsi_lookup -* -* writes a scmd entry into the ScsiLookup[] array list +* mptscsih_set_scsi_lookup - write a scmd entry into the ScsiLookup[] array list * * @ioc: Pointer to MPT_ADAPTER structure * @i: index into the array
@@ -2726,7 +2724,7 @@ mptscsih_scandv_complete(MPT_ADAPTER *io/** -* mptscsih_get_completion_code - +* mptscsih_get_completion_code - get completion code from MPT request * @ioc: Pointer to MPT_ADAPTER structure * @req: Pointer to original MPT request frame * @reply: Pointer to MPT reply frame (NULL if TurboReply)
PATCH 10/10 Documentation: update SubmitChecklist for O=objdir and kconfig testing
In reply to Randy DunlapFrom: Randy Dunlap <[email protected]>
Add build testing using 'O=builddir'.
Add build testing with various kconfig symbols disabled, listing common ones that are known to cause build problems.
--- Documentation/SubmitChecklist | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Documentation/SubmitChecklist +12 -0
@@ -18,6 +18,8 @@ kernel patches. 2b: Passes allnoconfig, allmodconfig +2c: Builds successfully when using O=builddir + 3: Builds on multiple CPU architectures by using local cross-compile tools or some other build farm.
@@ -95,3 +97,13 @@ kernel patches. 25: If any ioctl's are added by the patch, then also update Documentation/ioctl/ioctl-number.txt. + +26: If your modified source code depends on or uses any of the kernel + APIs or features that are related to the following kconfig symbols, + then test multiple builds with the related kconfig symbols disabled + and/or =m (if that option is available) [not all of these at the + same time, just various/random combinations of them]: + + CONFIG_SMP, CONFIG_SYSFS, CONFIG_PROC_FS, CONFIG_INPUT, CONFIG_PCI, + CONFIG_BLOCK, CONFIG_PM, CONFIG_HOTPLUG, CONFIG_MAGIC_SYSRQ, + CONFIG_NET, CONFIG_INET=n (but latter with CONFIG_NET=y)