Commit 1ff8392c authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c
parents 70b315b0 5bae7ac9
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -45,3 +45,6 @@ series


# cscope files
# cscope files
cscope.*
cscope.*

*.orig
*.rej
+133 −9
Original line number Original line Diff line number Diff line
@@ -12,6 +12,8 @@ Following translations are available on the WWW:


00-INDEX
00-INDEX
	- this file.
	- this file.
ABI/
	- info on kernel <-> userspace ABI and relative interface stability.
BUG-HUNTING
BUG-HUNTING
	- brute force method of doing binary search of patches to find bug.
	- brute force method of doing binary search of patches to find bug.
Changes
Changes
@@ -25,37 +27,57 @@ DMA-mapping.txt
DocBook/
DocBook/
	- directory with DocBook templates etc. for kernel documentation.
	- directory with DocBook templates etc. for kernel documentation.
HOWTO
HOWTO
	- The process and procedures of how to do Linux kernel development.
	- the process and procedures of how to do Linux kernel development.
IO-mapping.txt
IO-mapping.txt
	- how to access I/O mapped memory from within device drivers.
	- how to access I/O mapped memory from within device drivers.
IPMI.txt
IPMI.txt
	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
IRQ-affinity.txt
IRQ-affinity.txt
	- how to select which CPU(s) handle which interrupt events on SMP.
	- how to select which CPU(s) handle which interrupt events on SMP.
IRQ.txt
	- description of what an IRQ is.
ManagementStyle
ManagementStyle
	- how to (attempt to) manage kernel hackers.
	- how to (attempt to) manage kernel hackers.
MSI-HOWTO.txt
MSI-HOWTO.txt
	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
	- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
PCIEBUS-HOWTO.txt
	- a guide describing the PCI Express Port Bus driver.
RCU/
RCU/
	- directory with info on RCU (read-copy update).
	- directory with info on RCU (read-copy update).
README.DAC960
README.DAC960
	- info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
	- info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
README.cycladesZ
	- info on Cyclades-Z firmware loading.
SAK.txt
SAK.txt
	- info on Secure Attention Keys.
	- info on Secure Attention Keys.
SecurityBugs
	- procedure for reporting security bugs found in the kernel.
SubmitChecklist
	- Linux kernel patch submission checklist.
SubmittingDrivers
SubmittingDrivers
	- procedure to get a new driver source included into the kernel tree.
	- procedure to get a new driver source included into the kernel tree.
SubmittingPatches
SubmittingPatches
	- procedure to get a source patch included into the kernel tree.
	- procedure to get a source patch included into the kernel tree.
VGA-softcursor.txt
VGA-softcursor.txt
	- how to change your VGA cursor from a blinking underscore.
	- how to change your VGA cursor from a blinking underscore.
accounting/
	- documentation on accounting and taskstats.
aoe/
	- description of AoE (ATA over Ethernet) along with config examples.
applying-patches.txt
applying-patches.txt
	- description of various trees and how to apply their patches.
	- description of various trees and how to apply their patches.
arm/
arm/
	- directory with info about Linux on the ARM architecture.
	- directory with info about Linux on the ARM architecture.
atomic_ops.txt
	- semantics and behavior of atomic and bitmask operations.
auxdisplay/
	- misc. LCD driver documentation (cfag12864b, ks0108).
basic_profiling.txt
basic_profiling.txt
	- basic instructions for those who wants to profile Linux kernel.
	- basic instructions for those who wants to profile Linux kernel.
binfmt_misc.txt
binfmt_misc.txt
	- info on the kernel support for extra binary formats.
	- info on the kernel support for extra binary formats.
blackfin/
	- directory with documentation for the Blackfin arch.
block/
block/
	- info on the Block I/O (BIO) layer.
	- info on the Block I/O (BIO) layer.
cachetlb.txt
cachetlb.txt
@@ -68,16 +90,32 @@ cli-sti-removal.txt
	- cli()/sti() removal guide.
	- cli()/sti() removal guide.
computone.txt
computone.txt
	- info on Computone Intelliport II/Plus Multiport Serial Driver.
	- info on Computone Intelliport II/Plus Multiport Serial Driver.
connector/
	- docs on the netlink based userspace<->kernel space communication mod.
console/
	- documentation on Linux console drivers.
cpqarray.txt
cpqarray.txt
	- info on using Compaq's SMART2 Intelligent Disk Array Controllers.
	- info on using Compaq's SMART2 Intelligent Disk Array Controllers.
cpu-freq/
cpu-freq/
	- info on CPU frequency and voltage scaling.
	- info on CPU frequency and voltage scaling.
cpu-hotplug.txt
	- document describing CPU hotplug support in the Linux kernel.
cpu-load.txt
	- document describing how CPU load statistics are collected.
cpusets.txt
	- documents the cpusets feature; assign CPUs and Mem to a set of tasks.
cputopology.txt
	- documentation on how CPU topology info is exported via sysfs.
cris/
cris/
	- directory with info about Linux on CRIS architecture.
	- directory with info about Linux on CRIS architecture.
crypto/
crypto/
	- directory with info on the Crypto API.
	- directory with info on the Crypto API.
dcdbas.txt
	- information on the Dell Systems Management Base Driver.
debugging-modules.txt
debugging-modules.txt
	- some notes on debugging modules after Linux 2.6.3.
	- some notes on debugging modules after Linux 2.6.3.
dell_rbu.txt
	- document demonstrating the use of the Dell Remote BIOS Update driver.
device-mapper/
device-mapper/
	- directory with info on Device Mapper.
	- directory with info on Device Mapper.
devices.txt
devices.txt
@@ -86,32 +124,52 @@ digiepca.txt
	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
dnotify.txt
dnotify.txt
	- info about directory notification in Linux.
	- info about directory notification in Linux.
dontdiff
	- file containing a list of files that should never be diff'ed.
driver-model/
driver-model/
	- directory with info about Linux driver model.
	- directory with info about Linux driver model.
drivers/
	- directory with driver documentation (currently only EDAC).
dvb/
dvb/
	- info on Linux Digital Video Broadcast (DVB) subsystem.
	- info on Linux Digital Video Broadcast (DVB) subsystem.
early-userspace/
early-userspace/
	- info about initramfs, klibc, and userspace early during boot.
	- info about initramfs, klibc, and userspace early during boot.
ecryptfs.txt
	- docs on eCryptfs: stacked cryptographic filesystem for Linux.
eisa.txt
eisa.txt
	- info on EISA bus support.
	- info on EISA bus support.
exception.txt
exception.txt
	- how Linux v2.2 handles exceptions without verify_area etc.
	- how Linux v2.2 handles exceptions without verify_area etc.
fault-injection/
	- dir with docs about the fault injection capabilities infrastructure.
fb/
fb/
	- directory with info on the frame buffer graphics abstraction layer.
	- directory with info on the frame buffer graphics abstraction layer.
feature-removal-schedule.txt
	- list of files and features that are going to be removed.
filesystems/
filesystems/
	- directory with info on the various filesystems that Linux supports.
	- directory with info on the various filesystems that Linux supports.
firmware_class/
firmware_class/
	- request_firmware() hotplug interface info.
	- request_firmware() hotplug interface info.
floppy.txt
floppy.txt
	- notes and driver options for the floppy disk driver.
	- notes and driver options for the floppy disk driver.
fujitsu/
	- Fujitsu FR-V Linux documentation.
gpio.txt
	- overview of GPIO (General Purpose Input/Output) access conventions.
hayes-esp.txt
hayes-esp.txt
	- info on using the Hayes ESP serial driver.
	- info on using the Hayes ESP serial driver.
highuid.txt
highuid.txt
	- notes on the change from 16 bit to 32 bit user/group IDs.
	- notes on the change from 16 bit to 32 bit user/group IDs.
hpet.txt
hpet.txt
	- High Precision Event Timer Driver for Linux.
	- High Precision Event Timer Driver for Linux.
hrtimer/
	- info on the timer_stats debugging facility for timer (ab)use.
hrtimers/
	- info on the hrtimers subsystem for high-resolution kernel timers.
hw_random.txt
hw_random.txt
	- info on Linux support for random number generator in i8xx chipsets.
	- info on Linux support for random number generator in i8xx chipsets.
hwmon/
	- directory with docs on various hardware monitoring drivers.
i2c/
i2c/
	- directory with info about the I2C bus/protocol (2 wire, kHz speed).
	- directory with info about the I2C bus/protocol (2 wire, kHz speed).
i2o/
i2o/
@@ -122,16 +180,22 @@ ia64/
	- directory with info about Linux on Intel 64 bit architecture.
	- directory with info about Linux on Intel 64 bit architecture.
ide.txt
ide.txt
	- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
	- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).
infiniband/
	- directory with documents concerning Linux InfiniBand support.
initrd.txt
initrd.txt
	- how to use the RAM disk as an initial/temporary root filesystem.
	- how to use the RAM disk as an initial/temporary root filesystem.
input/
input/
	- info on Linux input device support.
	- info on Linux input device support.
io_ordering.txt
io_ordering.txt
	- info on ordering I/O writes to memory-mapped addresses.
	- info on ordering I/O writes to memory-mapped addresses.
ioctl/
	- directory with documents describing various IOCTL calls.
ioctl-number.txt
ioctl-number.txt
	- how to implement and register device/driver ioctl calls.
	- how to implement and register device/driver ioctl calls.
iostats.txt
iostats.txt
	- info on I/O statistics Linux kernel provides.
	- info on I/O statistics Linux kernel provides.
irqflags-tracing.txt
	- how to use the irq-flags tracing feature.
isapnp.txt
isapnp.txt
	- info on Linux ISA Plug & Play support.
	- info on Linux ISA Plug & Play support.
isdn/
isdn/
@@ -140,26 +204,40 @@ java.txt
	- info on the in-kernel binary support for Java(tm).
	- info on the in-kernel binary support for Java(tm).
kbuild/
kbuild/
	- directory with info about the kernel build process.
	- directory with info about the kernel build process.
kdumpt.txt
kdump/
       - mini HowTo on getting the crash dump code to work.
	- directory with mini HowTo on getting the crash dump code to work.
kernel-doc-nano-HOWTO.txt
kernel-doc-nano-HOWTO.txt
	- mini HowTo on generation and location of kernel documentation files.
	- mini HowTo on generation and location of kernel documentation files.
kernel-docs.txt
kernel-docs.txt
	- listing of various WWW + books that document kernel internals.
	- listing of various WWW + books that document kernel internals.
kernel-parameters.txt
kernel-parameters.txt
	- summary listing of command line / boot prompt args for the kernel.
	- summary listing of command line / boot prompt args for the kernel.
keys-request-key.txt
	- description of the kernel key request service.
keys.txt
	- description of the kernel key retention service.
kobject.txt
kobject.txt
	- info of the kobject infrastructure of the Linux kernel.
	- info of the kobject infrastructure of the Linux kernel.
kprobes.txt
	- documents the kernel probes debugging feature.
kref.txt
	- docs on adding reference counters (krefs) to kernel objects.
laptop-mode.txt
laptop-mode.txt
	- How to conserve battery power using laptop-mode.
	- how to conserve battery power using laptop-mode.
ldm.txt
ldm.txt
	- a brief description of LDM (Windows Dynamic Disks).
	- a brief description of LDM (Windows Dynamic Disks).
leds-class.txt
	- documents LED handling under Linux.
local_ops.txt
	- semantics and behavior of local atomic operations.
lockdep-design.txt
	- documentation on the runtime locking correctness validator.
locks.txt
locks.txt
	- info on file locking implementations, flock() vs. fcntl(), etc.
	- info on file locking implementations, flock() vs. fcntl(), etc.
logo.gif
logo.gif
	- Full colour GIF image of Linux logo (penguin).
	- full colour GIF image of Linux logo (penguin - Tux).
logo.txt
logo.txt
	- Info on creator of above logo & site to get additional images from.
	- info on creator of above logo & site to get additional images from.
m68k/
m68k/
	- directory with info about Linux on Motorola 68k architecture.
	- directory with info about Linux on Motorola 68k architecture.
magic-number.txt
magic-number.txt
@@ -170,6 +248,8 @@ mca.txt
	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.
md.txt
md.txt
	- info on boot arguments for the multiple devices driver.
	- info on boot arguments for the multiple devices driver.
memory-barriers.txt
	- info on Linux kernel memory barriers.
memory.txt
memory.txt
	- info on typical Linux memory problems.
	- info on typical Linux memory problems.
mips/
mips/
@@ -177,9 +257,11 @@ mips/
mono.txt
mono.txt
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
moxa-smartio
moxa-smartio
	- info on installing/using Moxa multiport serial driver.
	- file with info on installing/using Moxa multiport serial driver.
mtrr.txt
mtrr.txt
	- how to use PPro Memory Type Range Registers to increase performance.
	- how to use PPro Memory Type Range Registers to increase performance.
mutex-design.txt
	- info on the generic mutex subsystem.
nbd.txt
nbd.txt
	- info on a TCP implementation of a network block device.
	- info on a TCP implementation of a network block device.
netlabel/
netlabel/
@@ -190,6 +272,8 @@ nfsroot.txt
	- short guide on setting up a diskless box with NFS root filesystem.
	- short guide on setting up a diskless box with NFS root filesystem.
nmi_watchdog.txt
nmi_watchdog.txt
	- info on NMI watchdog for SMP systems.
	- info on NMI watchdog for SMP systems.
nommu-mmap.txt
	- documentation about no-mmu memory mapping support.
numastat.txt
numastat.txt
	- info on how to read Numa policy hit/miss statistics in sysfs.
	- info on how to read Numa policy hit/miss statistics in sysfs.
oops-tracing.txt
oops-tracing.txt
@@ -202,8 +286,16 @@ parport.txt
	- how to use the parallel-port driver.
	- how to use the parallel-port driver.
parport-lowlevel.txt
parport-lowlevel.txt
	- description and usage of the low level parallel port functions.
	- description and usage of the low level parallel port functions.
pci-error-recovery.txt
	- info on PCI error recovery.
pci.txt
pci.txt
	- info on the PCI subsystem for device driver authors.
	- info on the PCI subsystem for device driver authors.
pcieaer-howto.txt
	- the PCI Express Advanced Error Reporting Driver Guide HOWTO.
pcmcia/
	- info on the Linux PCMCIA driver.
pi-futex.txt
	- documentation on lightweight PI-futexes.
pm.txt
pm.txt
	- info on Linux power management support.
	- info on Linux power management support.
pnp.txt
pnp.txt
@@ -214,18 +306,32 @@ powerpc/
	- directory with info on using Linux with the PowerPC.
	- directory with info on using Linux with the PowerPC.
preempt-locking.txt
preempt-locking.txt
	- info on locking under a preemptive kernel.
	- info on locking under a preemptive kernel.
prio_tree.txt
	- info on radix-priority-search-tree use for indexing vmas.
ramdisk.txt
ramdisk.txt
	- short guide on how to set up and use the RAM disk.
	- short guide on how to set up and use the RAM disk.
rbtree.txt
	- info on what red-black trees are and what they are for.
riscom8.txt
riscom8.txt
	- notes on using the RISCom/8 multi-port serial driver.
	- notes on using the RISCom/8 multi-port serial driver.
robust-futex-ABI.txt
	- documentation of the robust futex ABI.
robust-futexes.txt
	- a description of what robust futexes are.
rocket.txt
rocket.txt
	- info on the Comtrol RocketPort multiport serial driver.
	- info on the Comtrol RocketPort multiport serial driver.
rpc-cache.txt
rpc-cache.txt
	- introduction to the caching mechanisms in the sunrpc layer.
	- introduction to the caching mechanisms in the sunrpc layer.
rt-mutex-design.txt
	- description of the RealTime mutex implementation design.
rt-mutex.txt
	- desc. of RT-mutex subsystem with PI (Priority Inheritance) support.
rtc.txt
rtc.txt
	- notes on how to use the Real Time Clock (aka CMOS clock) driver.
	- notes on how to use the Real Time Clock (aka CMOS clock) driver.
s390/
s390/
	- directory with info on using Linux on the IBM S390.
	- directory with info on using Linux on the IBM S390.
sched-arch.txt
	- CPU Scheduler implementation hints for architecture specific code.
sched-coding.txt
sched-coding.txt
	- reference for various scheduler-related methods in the O(1) scheduler.
	- reference for various scheduler-related methods in the O(1) scheduler.
sched-design.txt
sched-design.txt
@@ -240,22 +346,32 @@ serial/
	- directory with info on the low level serial API.
	- directory with info on the low level serial API.
serial-console.txt
serial-console.txt
	- how to set up Linux with a serial line console as the default.
	- how to set up Linux with a serial line console as the default.
sgi-ioc4.txt
	- description of the SGI IOC4 PCI (multi function) device.
sgi-visws.txt
sgi-visws.txt
	- short blurb on the SGI Visual Workstations.
	- short blurb on the SGI Visual Workstations.
sh/
sh/
	- directory with info on porting Linux to a new architecture.
	- directory with info on porting Linux to a new architecture.
sharedsubtree.txt
	- a description of shared subtrees for namespaces.
smart-config.txt
smart-config.txt
	- description of the Smart Config makefile feature.
	- description of the Smart Config makefile feature.
smp.txt
smp.txt
	- a few notes on symmetric multi-processing.
	- a few notes on symmetric multi-processing.
sony-laptop.txt
	- Sony Notebook Control Driver (SNC) Readme.
sonypi.txt
sonypi.txt
	- info on Linux Sony Programmable I/O Device support.
	- info on Linux Sony Programmable I/O Device support.
sound/
sound/
	- directory with info on sound card support.
	- directory with info on sound card support.
sparc/
sparc/
	- directory with info on using Linux on Sparc architecture.
	- directory with info on using Linux on Sparc architecture.
sparse.txt
	- info on how to obtain and use the sparse tool for typechecking.
specialix.txt
specialix.txt
	- info on hardware/driver for specialix IO8+ multiport serial card.
	- info on hardware/driver for specialix IO8+ multiport serial card.
spi/
	- overview of Linux kernel Serial Peripheral Interface (SPI) support.
spinlocks.txt
spinlocks.txt
	- info on using spinlocks to provide exclusive access in kernel.
	- info on using spinlocks to provide exclusive access in kernel.
stable_api_nonsense.txt
stable_api_nonsense.txt
@@ -274,24 +390,32 @@ sysrq.txt
	- info on the magic SysRq key.
	- info on the magic SysRq key.
telephony/
telephony/
	- directory with info on telephony (e.g. voice over IP) support.
	- directory with info on telephony (e.g. voice over IP) support.
thinkpad-acpi.txt
	- information on the (IBM and Lenovo) ThinkPad ACPI Extras driver.
time_interpolators.txt
time_interpolators.txt
	- info on time interpolators.
	- info on time interpolators.
tipar.txt
tipar.txt
	- information about Parallel link cable for Texas Instruments handhelds.
	- information about Parallel link cable for Texas Instruments handhelds.
tty.txt
tty.txt
	- guide to the locking policies of the tty layer.
	- guide to the locking policies of the tty layer.
unicode.txt
	- info on the Unicode character/font mapping used in Linux.
uml/
uml/
	- directory with information about User Mode Linux.
	- directory with information about User Mode Linux.
unicode.txt
	- info on the Unicode character/font mapping used in Linux.
unshare.txt
	- description of the Linux unshare system call.
usb/
usb/
	- directory with info regarding the Universal Serial Bus.
	- directory with info regarding the Universal Serial Bus.
video-output.txt
	- sysfs class driver interface to enable/disable a video output device.
video4linux/
video4linux/
	- directory with info regarding video/TV/radio cards and linux.
	- directory with info regarding video/TV/radio cards and linux.
vm/
vm/
	- directory with info on the Linux vm code.
	- directory with info on the Linux vm code.
voyager.txt
voyager.txt
	- guide to running Linux on the Voyager architecture.
	- guide to running Linux on the Voyager architecture.
w1/
	- directory with documents regarding the 1-wire (w1) subsystem.
watchdog/
watchdog/
	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)
	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)
x86_64/
x86_64/
+16 −0
Original line number Original line Diff line number Diff line
What:		legacy isochronous ABI of raw1394 (1st generation iso ABI)
Date:		June 2007 (scheduled), removed in kernel v2.6.23
Contact:	linux1394-devel@lists.sourceforge.net
Description:
	The two request types RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN have
	been deprecated for quite some time.  They are very inefficient as they
	come with high interrupt load and several layers of callbacks for each
	packet.  Because of these deficiencies, the video1394 and dv1394 drivers
	and the 3rd-generation isochronous ABI in raw1394 (rawiso) were created.

Users:
	libraw1394 users via the long deprecated API raw1394_iso_write,
	raw1394_start_iso_write, raw1394_start_iso_rcv, raw1394_stop_iso_rcv

	libdc1394, which optionally uses these old libraw1394 calls
	alternatively to the more efficient video1394 ABI
+13 −0
Original line number Original line Diff line number Diff line
@@ -39,3 +39,16 @@ Description:
		If you want to suspend a device immediately but leave it
		If you want to suspend a device immediately but leave it
		free to wake up in response to I/O requests, you should
		free to wake up in response to I/O requests, you should
		write "0" to power/autosuspend.
		write "0" to power/autosuspend.

What:		/sys/bus/usb/devices/.../power/persist
Date:		May 2007
KernelVersion:	2.6.23
Contact:	Alan Stern <stern@rowland.harvard.edu>
Description:
		If CONFIG_USB_PERSIST is set, then each USB device directory
		will contain a file named power/persist.  The file holds a
		boolean value (0 or 1) indicating whether or not the
		"USB-Persist" facility is enabled for the device.  Since the
		facility is inherently dangerous, it is disabled by default
		for all devices except hubs.  For more information, see
		Documentation/usb/persist.txt.
+39 −0
Original line number Original line Diff line number Diff line
@@ -218,6 +218,18 @@ no space after the prefix increment & decrement unary operators:


and no space around the '.' and "->" structure member operators.
and no space around the '.' and "->" structure member operators.


Do not leave trailing whitespace at the ends of lines.  Some editors with
"smart" indentation will insert whitespace at the beginning of new lines as
appropriate, so you can start typing the next line of code right away.
However, some such editors do not remove the whitespace if you end up not
putting a line of code there, such as if you leave a blank line.  As a result,
you end up with lines containing trailing whitespace.

Git will warn you about patches that introduce trailing whitespace, and can
optionally strip the trailing whitespace for you; however, if applying a series
of patches, this may make later patches in the series fail by changing their
context lines.



		Chapter 4: Naming
		Chapter 4: Naming


@@ -726,6 +738,33 @@ need them. Feel free to peruse that header file to see what else is already
defined that you shouldn't reproduce in your code.
defined that you shouldn't reproduce in your code.




		Chapter 18:  Editor modelines and other cruft

Some editors can interpret configuration information embedded in source files,
indicated with special markers.  For example, emacs interprets lines marked
like this:

-*- mode: c -*-

Or like this:

/*
Local Variables:
compile-command: "gcc -DMAGIC_DEBUG_FLAG foo.c"
End:
*/

Vim interprets markers that look like this:

/* vim:set sw=8 noet */

Do not include any of these in source files.  People have their own personal
editor configurations, and your source files should not override them.  This
includes markers for indentation and mode configuration.  People may use their
own custom mode, or may have some other magic method for making indentation
work correctly.




		Appendix I: References
		Appendix I: References


Loading