14 files changed, 526 insertions, 90 deletions

diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index 05431621c861..805db4b2cba6 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -77,7 +77,7 @@ To get this part of the dma_ API, you must #include <linux/dmapool.h>
 Many drivers need lots of small dma-coherent memory regions for DMA
 descriptors or I/O buffers.  Rather than allocating in units of a page
 or more using dma_alloc_coherent(), you can use DMA pools.  These work
-much like a kmem_cache_t, except that they use the dma-coherent allocator
+much like a struct kmem_cache, except that they use the dma-coherent allocator
 not __get_free_pages().  Also, they understand common hardware constraints
 for alignment, like queue heads needing to be aligned on N byte boundaries.
 
@@ -94,7 +94,7 @@ The pool create() routines initialize a pool of dma-coherent buffers
 for use with a given device.  It must be called in a context which
 can sleep.
 
-The "name" is for diagnostics (like a kmem_cache_t name); dev and size
+The "name" is for diagnostics (like a struct kmem_cache name); dev and size
 are like what you'd pass to dma_alloc_coherent().  The device's hardware
 alignment requirement for this type of data is "align" (which is expressed
 in bytes, and must be a power of two).  If your device has no boundary
@@ -431,10 +431,10 @@ be identical to those passed in (and returned by
 dma_alloc_noncoherent()).
 
 int
-dma_is_consistent(dma_addr_t dma_handle)
+dma_is_consistent(struct device *dev, dma_addr_t dma_handle)
 
-returns true if the memory pointed to by the dma_handle is actually
-consistent.
+returns true if the device dev is performing consistent DMA on the memory
+area pointed to by the dma_handle.
 
 int
 dma_get_cache_alignment(void)
@@ -459,7 +459,7 @@ anything like this.  You must also be extra careful about accessing
 memory you intend to sync partially.
 
 void
-dma_cache_sync(void *vaddr, size_t size,
+dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                enum dma_data_direction direction)
 
 Do a partial sync of memory that was allocated by
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index db9499adbed4..36526a1e76d7 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -190,9 +190,13 @@ quiet_cmd_fig2png = FIG2PNG $@
 ###
 # Help targets as used by the top-level makefile
 dochelp:
-        @echo  '  Linux kernel internal documentation in different formats:'
-        @echo  '  xmldocs (XML DocBook), psdocs (Postscript), pdfdocs (PDF)'
-        @echo  '  htmldocs (HTML), mandocs (man pages, use installmandocs to install)'
+        @echo  ' Linux kernel internal documentation in different formats:'
+        @echo  '  htmldocs        - HTML'
+        @echo  '  installmandocs  - install man pages generated by mandocs'
+        @echo  '  mandocs         - man pages'
+        @echo  '  pdfdocs         - PDF'
+        @echo  '  psdocs          - Postscript'
+        @echo  '  xmldocs         - XML DocBook'
 
 ###
 # Temporary files left by various tools
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index a166675c4303..ca094913c555 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -418,9 +418,35 @@ X!Edrivers/pnp/system.c
 !Idrivers/parport/daisy.c
   </chapter>
 
-  <chapter id="viddev">
-     <title>Video4Linux</title>
-!Edrivers/media/video/videodev.c
+  <chapter id="message_devices">
+        <title>Message-based devices</title>
+     <sect1><title>Fusion message devices</title>
+!Edrivers/message/fusion/mptbase.c
+!Idrivers/message/fusion/mptbase.c
+!Edrivers/message/fusion/mptscsih.c
+!Idrivers/message/fusion/mptscsih.c
+!Idrivers/message/fusion/mptctl.c
+!Idrivers/message/fusion/mptspi.c
+!Idrivers/message/fusion/mptfc.c
+!Idrivers/message/fusion/mptlan.c
+     </sect1>
+     <sect1><title>I2O message devices</title>
+!Iinclude/linux/i2o.h
+!Idrivers/message/i2o/core.h
+!Edrivers/message/i2o/iop.c
+!Idrivers/message/i2o/iop.c
+!Idrivers/message/i2o/config-osm.c
+!Edrivers/message/i2o/exec-osm.c
+!Idrivers/message/i2o/exec-osm.c
+!Idrivers/message/i2o/bus-osm.c
+!Edrivers/message/i2o/device.c
+!Idrivers/message/i2o/device.c
+!Idrivers/message/i2o/driver.c
+!Idrivers/message/i2o/pci.c
+!Idrivers/message/i2o/i2o_block.c
+!Idrivers/message/i2o/i2o_scsi.c
+!Idrivers/message/i2o/i2o_proc.c
+     </sect1>
   </chapter>
 
   <chapter id="snddev">
diff --git a/Documentation/IPMI.txt b/Documentation/IPMI.txt
index 0e3924ecd76b..24dc3fcf1594 100644
--- a/Documentation/IPMI.txt
+++ b/Documentation/IPMI.txt
@@ -365,6 +365,7 @@ You can change this at module load time (for a module) with:
        regshifts=<shift1>,<shift2>,...
        slave_addrs=<addr1>,<addr2>,...
        force_kipmid=<enable1>,<enable2>,...
+       unload_when_empty=[0|1]
 
 Each of these except si_trydefaults is a list, the first item for the
 first interface, second item for the second interface, etc.
@@ -416,6 +417,11 @@ by the driver, but systems with broken interrupts might need an enable,
 or users that don't want the daemon (don't need the performance, don't
 want the CPU hit) can disable it.
 
+If unload_when_empty is set to 1, the driver will be unloaded if it
+doesn't find any interfaces or all the interfaces fail to work.  The
+default is one.  Setting to 0 is useful with the hotmod, but is
+obviously only useful for modules.
+
 When compiled into the kernel, the parameters can be specified on the
 kernel command line as:
 
@@ -441,6 +447,25 @@ have high-res timers enabled in the kernel and you don't have
 interrupts enabled, the driver will run VERY slowly.  Don't blame me,
 these interfaces suck.
 
+The driver supports a hot add and remove of interfaces.  This way,
+interfaces can be added or removed after the kernel is up and running.
+This is done using /sys/modules/ipmi_si/hotmod, which is a write-only
+parameter.  You write a string to this interface.  The string has the
+format:
+   <op1>[:op2[:op3...]]
+The "op"s are:
+   add|remove,kcs|bt|smic,mem|i/o,<address>[,<opt1>[,<opt2>[,...]]]
+You can specify more than one interface on the line.  The "opt"s are:
+   rsp=<regspacing>
+   rsi=<regsize>
+   rsh=<regshift>
+   irq=<irq>
+   ipmb=<ipmb slave addr>
+and these have the same meanings as discussed above.  Note that you
+can also use this on the kernel command line for a more compact format
+for specifying an interface.  Note that when removing an interface,
+only the first three parameters (si type, address type, and address)
+are used for the comparison.  Any options are ignored for removing.
 
 The SMBus Driver
 ----------------
@@ -502,7 +527,10 @@ used to control it:
 
   modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type>
       preaction=<preaction type> preop=<preop type> start_now=x
-      nowayout=x
+      nowayout=x ifnum_to_use=n
+
+ifnum_to_use specifies which interface the watchdog timer should use.
+The default is -1, which means to pick the first one registered.
 
 The timeout is the number of seconds to the action, and the pretimeout
 is the amount of seconds before the reset that the pre-timeout panic will
@@ -624,5 +652,9 @@ command line.  The parameter is also available via the proc filesystem
 in /proc/sys/dev/ipmi/poweroff_powercycle.  Note that if the system
 does not support power cycling, it will always do the power off.
 
+The "ifnum_to_use" parameter specifies which interface the poweroff
+code should use.  The default is -1, which means to pick the first one
+registered.
+
 Note that if you have ACPI enabled, the system will prefer using ACPI to
 power off.
diff --git a/Documentation/block/as-iosched.txt b/Documentation/block/as-iosched.txt
index e2a66f8143c5..a598fe10a297 100644
--- a/Documentation/block/as-iosched.txt
+++ b/Documentation/block/as-iosched.txt
@@ -24,8 +24,10 @@ very similar behavior to the deadline IO scheduler.
 Selecting IO schedulers
 -----------------------
 To choose IO schedulers at boot time, use the argument 'elevator=deadline'.
-'noop' and 'as' (the default) are also available. IO schedulers are assigned
-globally at boot time only presently.
+'noop', 'as' and 'cfq' (the default) are also available. IO schedulers are
+assigned globally at boot time only presently. It's also possible to change
+the IO scheduler for a determined device on the fly, as described in
+Documentation/block/switching-sched.txt.
 
 
 Anticipatory IO scheduler Policies
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 70690f1a14af..8de132a02ba9 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -3,7 +3,7 @@
 
              Maintained by Torben Mathiasen <device@lanana.org>
 
-                      Last revised: 15 May 2006
+                      Last revised: 29 November 2006
 
 This list is the Linux Device List, the official registry of allocated
 device numbers and /dev directory nodes for the Linux operating
@@ -94,6 +94,7 @@ Your cooperation is appreciated.
                   9 = /dev/urandom      Faster, less secure random number gen.
                  10 = /dev/aio          Asynchronous I/O notification interface
                  11 = /dev/kmsg         Writes to this come out as printk's
+
   1 block       RAM disk
                   0 = /dev/ram0         First RAM disk
                   1 = /dev/ram1         Second RAM disk
@@ -122,7 +123,7 @@ Your cooperation is appreciated.
                 devices are on major 128 and above and use the PTY
                 master multiplex (/dev/ptmx) to acquire a PTY on
                 demand.
-  
+
   2 block       Floppy disks
                   0 = /dev/fd0          Controller 0, drive 0, autodetect
                   1 = /dev/fd1          Controller 0, drive 1, autodetect
@@ -257,7 +258,7 @@ Your cooperation is appreciated.
                 129 = /dev/vcsa1        tty1 text/attribute contents
                     ...
                 191 = /dev/vcsa63       tty63 text/attribute contents
-        
+
                 NOTE: These devices permit both read and write access.
 
   7 block       Loopback devices
@@ -411,7 +412,7 @@ Your cooperation is appreciated.
                 207 = /dev/video/em8300_sp      EM8300 DVD decoder subpicture
                 208 = /dev/compaq/cpqphpc       Compaq PCI Hot Plug Controller
                 209 = /dev/compaq/cpqrid        Compaq Remote Insight Driver
-                210 = /dev/impi/bt      IMPI coprocessor block transfer 
+                210 = /dev/impi/bt      IMPI coprocessor block transfer
                 211 = /dev/impi/smic    IMPI coprocessor stream interface
                 212 = /dev/watchdogs/0  First watchdog device
                 213 = /dev/watchdogs/1  Second watchdog device
@@ -506,6 +507,7 @@ Your cooperation is appreciated.
                  33 = /dev/patmgr1      Sequencer patch manager
                  34 = /dev/midi02       Third MIDI port
                  50 = /dev/midi03       Fourth MIDI port
+
  14 block       BIOS harddrive callback support {2.6}
                   0 = /dev/dos_hda      First BIOS harddrive whole disk
                  64 = /dev/dos_hdb      Second BIOS harddrive whole disk
@@ -527,6 +529,7 @@ Your cooperation is appreciated.
 
  16 char        Non-SCSI scanners
                   0 = /dev/gs4500       Genius 4500 handheld scanner
+
  16 block       GoldStar CD-ROM
                   0 = /dev/gscd         GoldStar CD-ROM
 
@@ -548,6 +551,7 @@ Your cooperation is appreciated.
                   0 = /dev/ttyC0        First Cyclades port
                     ...
                  31 = /dev/ttyC31       32nd Cyclades port
+
  19 block       "Double" compressed disk
                   0 = /dev/double0      First compressed disk
                     ...
@@ -563,6 +567,7 @@ Your cooperation is appreciated.
                   0 = /dev/cub0         Callout device for ttyC0
                     ...
                  31 = /dev/cub31        Callout device for ttyC31
+
  20 block       Hitachi CD-ROM (under development)
                   0 = /dev/hitcd        Hitachi CD-ROM
 
@@ -582,7 +587,7 @@ Your cooperation is appreciated.
 
                 This device is used on the ARM-based Acorn RiscPC.
                 Partitions are handled the same way as for IDE disks
-                (see major number 3). 
+                (see major number 3).
 
  22 char        Digiboard serial card
                   0 = /dev/ttyD0        First Digiboard port
@@ -591,7 +596,7 @@ Your cooperation is appreciated.
  22 block       Second IDE hard disk/CD-ROM interface
                   0 = /dev/hdc          Master: whole disk (or CD-ROM)
                  64 = /dev/hdd          Slave: whole disk (or CD-ROM)
-                
+
                 Partitions are handled the same way as for the first
                 interface (see major number 3).
 
@@ -639,6 +644,7 @@ Your cooperation is appreciated.
 
  26 char        Quanta WinVision frame grabber {2.6}
                   0 = /dev/wvisfgrab    Quanta WinVision frame grabber
+
  26 block       Second Matsushita (Panasonic/SoundBlaster) CD-ROM
                   0 = /dev/sbpcd4       Panasonic CD-ROM controller 1 unit 0
                   1 = /dev/sbpcd5       Panasonic CD-ROM controller 1 unit 1
@@ -670,6 +676,7 @@ Your cooperation is appreciated.
                  37 = /dev/nrawqft1     Unit 1, no rewind-on-close, no file marks
                  38 = /dev/nrawqft2     Unit 2, no rewind-on-close, no file marks
                  39 = /dev/nrawqft3     Unit 3, no rewind-on-close, no file marks
+
  27 block       Third Matsushita (Panasonic/SoundBlaster) CD-ROM
                   0 = /dev/sbpcd8       Panasonic CD-ROM controller 2 unit 0
                   1 = /dev/sbpcd9       Panasonic CD-ROM controller 2 unit 1
@@ -681,6 +688,7 @@ Your cooperation is appreciated.
                   1 = /dev/staliomem1   Second Stallion card I/O memory
                   2 = /dev/staliomem2   Third Stallion card I/O memory
                   3 = /dev/staliomem3   Fourth Stallion card I/O memory
+
  28 char        Atari SLM ACSI laser printer (68k/Atari)
                   0 = /dev/slm0         First SLM laser printer
                   1 = /dev/slm1         Second SLM laser printer
@@ -690,6 +698,7 @@ Your cooperation is appreciated.
                   1 = /dev/sbpcd13      Panasonic CD-ROM controller 3 unit 1
                   2 = /dev/sbpcd14      Panasonic CD-ROM controller 3 unit 2
                   3 = /dev/sbpcd15      Panasonic CD-ROM controller 3 unit 3
+
  28 block       ACSI disk (68k/Atari)
                   0 = /dev/ada          First ACSI disk whole disk
                  16 = /dev/adb          Second ACSI disk whole disk
@@ -750,6 +759,7 @@ Your cooperation is appreciated.
  31 char        MPU-401 MIDI
                   0 = /dev/mpu401data   MPU-401 data port
                   1 = /dev/mpu401stat   MPU-401 status port
+
  31 block       ROM/flash memory card
                   0 = /dev/rom0         First ROM card (rw)
                       ...
@@ -801,7 +811,7 @@ Your cooperation is appreciated.
  34 block       Fourth IDE hard disk/CD-ROM interface
                   0 = /dev/hdg          Master: whole disk (or CD-ROM)
                  64 = /dev/hdh          Slave: whole disk (or CD-ROM)
-                
+
                 Partitions are handled the same way as for the first
                 interface (see major number 3).
 
@@ -818,6 +828,7 @@ Your cooperation is appreciated.
                 129 = /dev/smpte1       Second MIDI port, SMPTE timed
                 130 = /dev/smpte2       Third MIDI port, SMPTE timed
                 131 = /dev/smpte3       Fourth MIDI port, SMPTE timed
+
  35 block       Slow memory ramdisk
                   0 = /dev/slram        Slow memory ramdisk
 
@@ -828,6 +839,7 @@ Your cooperation is appreciated.
                  16 = /dev/tap0         First Ethertap device
                     ...
                  31 = /dev/tap15        16th Ethertap device
+
  36 block       MCA ESDI hard disk
                   0 = /dev/eda          First ESDI disk whole disk
                  64 = /dev/edb          Second ESDI disk whole disk
@@ -882,6 +894,7 @@ Your cooperation is appreciated.
 
  40 char        Matrox Meteor frame grabber {2.6}
                   0 = /dev/mmetfgrab    Matrox Meteor frame grabber
+
  40 block       Syquest EZ135 parallel port removable drive
                   0 = /dev/eza          Parallel EZ135 drive, whole disk
 
@@ -893,6 +906,7 @@ Your cooperation is appreciated.
 
  41 char        Yet Another Micro Monitor
                   0 = /dev/yamm         Yet Another Micro Monitor
+
  41 block       MicroSolutions BackPack parallel port CD-ROM
                   0 = /dev/bpcd         BackPack CD-ROM
 
@@ -901,6 +915,7 @@ Your cooperation is appreciated.
                 the parallel port ATAPI CD-ROM driver at major number 46.
 
  42 char        Demo/sample use
+
  42 block       Demo/sample use
 
                 This number is intended for use in sample code, as
@@ -918,6 +933,7 @@ Your cooperation is appreciated.
                   0 = /dev/ttyI0        First virtual modem
                     ...
                  63 = /dev/ttyI63       64th virtual modem
+
  43 block       Network block devices
                   0 = /dev/nb0          First network block device
                   1 = /dev/nb1          Second network block device
@@ -934,12 +950,13 @@ Your cooperation is appreciated.
                   0 = /dev/cui0         Callout device for ttyI0
                     ...
                  63 = /dev/cui63        Callout device for ttyI63
+
  44 block       Flash Translation Layer (FTL) filesystems
                   0 = /dev/ftla         FTL on first Memory Technology Device
                  16 = /dev/ftlb         FTL on second Memory Technology Device
                  32 = /dev/ftlc         FTL on third Memory Technology Device
                     ...
-                240 = /dev/ftlp         FTL on 16th Memory Technology Device 
+                240 = /dev/ftlp         FTL on 16th Memory Technology Device
 
                 Partitions are handled in the same way as for IDE
                 disks (see major number 3) except that the partition
@@ -958,6 +975,7 @@ Your cooperation is appreciated.
                 191 = /dev/ippp63       64th SyncPPP device
 
                 255 = /dev/isdninfo     ISDN monitor interface
+
  45 block       Parallel port IDE disk devices
                   0 = /dev/pda          First parallel port IDE disk
                  16 = /dev/pdb          Second parallel port IDE disk
@@ -1044,6 +1062,7 @@ Your cooperation is appreciated.
                   1 = /dev/dcbri1       Second DataComm card
                   2 = /dev/dcbri2       Third DataComm card
                   3 = /dev/dcbri3       Fourth DataComm card
+
  52 block       Mylex DAC960 PCI RAID controller; fifth controller
                   0 = /dev/rd/c4d0      First disk, whole disk
                   8 = /dev/rd/c4d1      Second disk, whole disk
@@ -1093,6 +1112,7 @@ Your cooperation is appreciated.
 
  55 char        DSP56001 digital signal processor
                   0 = /dev/dsp56k       First DSP56001
+
  55 block       Mylex DAC960 PCI RAID controller; eighth controller
                   0 = /dev/rd/c7d0      First disk, whole disk
                   8 = /dev/rd/c7d1      Second disk, whole disk
@@ -1130,6 +1150,7 @@ Your cooperation is appreciated.
                   0 = /dev/cup0         Callout device for ttyP0
                   1 = /dev/cup1         Callout device for ttyP1
                     ...
+
  58 block       Reserved for logical volume manager
 
  59 char        sf firewall package
@@ -1149,6 +1170,7 @@ Your cooperation is appreciated.
                 NAMING CONFLICT -- PROPOSED REVISED NAME /dev/rpda0 etc
 
  60-63 char     LOCAL/EXPERIMENTAL USE
+
  60-63 block    LOCAL/EXPERIMENTAL USE
                 Allocated for local/experimental use.  For devices not
                 assigned official numbers, these ranges should be
@@ -1434,7 +1456,6 @@ Your cooperation is appreciated.
                 DAC960 (see major number 48) except that the limit on
                 partitions is 15.
 
-
  78 char        PAM Software's multimodem boards
                   0 = /dev/ttyM0        First PAM modem
                   1 = /dev/ttyM1        Second PAM modem
@@ -1450,7 +1471,6 @@ Your cooperation is appreciated.
                 DAC960 (see major number 48) except that the limit on
                 partitions is 15.
 
-
  79 char        PAM Software's multimodem boards - alternate devices
                   0 = /dev/cum0         Callout device for ttyM0
                   1 = /dev/cum1         Callout device for ttyM1
@@ -1466,7 +1486,6 @@ Your cooperation is appreciated.
                 DAC960 (see major number 48) except that the limit on
                 partitions is 15.
 
-
  80 char        Photometrics AT200 CCD camera
                   0 = /dev/at200        Photometrics AT200 CCD camera
 
@@ -1679,7 +1698,7 @@ Your cooperation is appreciated.
                   1 = /dev/dcxx1        Second capture card
                     ...
 
- 94 block IBM S/390 DASD block storage
+ 94 block       IBM S/390 DASD block storage
                   0 = /dev/dasda First DASD device, major
                   1 = /dev/dasda1 First DASD device, block 1
                   2 = /dev/dasda2 First DASD device, block 2
@@ -1695,7 +1714,7 @@ Your cooperation is appreciated.
                   1 = /dev/ipnat        NAT control device/log file
                   2 = /dev/ipstate      State information log file
                   3 = /dev/ipauth       Authentication control device/log file
-                    ...         
+                    ...
 
  96 char        Parallel port ATAPI tape devices
                   0 = /dev/pt0          First parallel port ATAPI tape
@@ -1705,7 +1724,7 @@ Your cooperation is appreciated.
                 129 = /dev/npt1         Second p.p. ATAPI tape, no rewind
                     ...
 
- 96 block Inverse NAND Flash Translation Layer
+ 96 block       Inverse NAND Flash Translation Layer
                   0 = /dev/inftla First INFTL layer
                  16 = /dev/inftlb Second INFTL layer
                     ...
@@ -1937,7 +1956,6 @@ Your cooperation is appreciated.
                     ...
 
 113 block       IBM iSeries virtual CD-ROM
-
                   0 = /dev/iseries/vcda First virtual CD-ROM
                   1 = /dev/iseries/vcdb Second virtual CD-ROM
                     ...
@@ -2059,11 +2077,12 @@ Your cooperation is appreciated.
                     ...
 
 119 char        VMware virtual network control
-                  0 = /dev/vnet0        1st virtual network
-                  1 = /dev/vnet1        2nd virtual network
+                  0 = /dev/vmnet0       1st virtual network
+                  1 = /dev/vmnet1       2nd virtual network
                     ...
 
 120-127 char    LOCAL/EXPERIMENTAL USE
+
 120-127 block   LOCAL/EXPERIMENTAL USE
                 Allocated for local/experimental use.  For devices not
                 assigned official numbers, these ranges should be
@@ -2075,7 +2094,6 @@ Your cooperation is appreciated.
                 nodes; instead they should be accessed through the
                 /dev/ptmx cloning interface.
 
-
 128 block       SCSI disk devices (128-143)
                   0 = /dev/sddy         129th SCSI disk whole disk
                  16 = /dev/sddz         130th SCSI disk whole disk
@@ -2087,7 +2105,6 @@ Your cooperation is appreciated.
                 disks (see major number 3) except that the limit on
                 partitions is 15.
 
-
 129 block       SCSI disk devices (144-159)
                   0 = /dev/sdeo         145th SCSI disk whole disk
                  16 = /dev/sdep         146th SCSI disk whole disk
@@ -2123,7 +2140,6 @@ Your cooperation is appreciated.
                 disks (see major number 3) except that the limit on
                 partitions is 15.
 
-
 132 block       SCSI disk devices (192-207)
                   0 = /dev/sdgk         193rd SCSI disk whole disk
                  16 = /dev/sdgl         194th SCSI disk whole disk
@@ -2135,7 +2151,6 @@ Your cooperation is appreciated.
                 disks (see major number 3) except that the limit on
                 partitions is 15.
 
-
 133 block       SCSI disk devices (208-223)
                   0 = /dev/sdha         209th SCSI disk whole disk
                  16 = /dev/sdhb         210th SCSI disk whole disk
@@ -2147,7 +2162,6 @@ Your cooperation is appreciated.
                 disks (see major number 3) except that the limit on
                 partitions is 15.
 
-
 134 block       SCSI disk devices (224-239)
                   0 = /dev/sdhq         225th SCSI disk whole disk
                  16 = /dev/sdhr         226th SCSI disk whole disk
@@ -2159,7 +2173,6 @@ Your cooperation is appreciated.
                 disks (see major number 3) except that the limit on
                 partitions is 15.
 
-
 135 block       SCSI disk devices (240-255)
                   0 = /dev/sdig         241st SCSI disk whole disk
                  16 = /dev/sdih         242nd SCSI disk whole disk
@@ -2171,7 +2184,6 @@ Your cooperation is appreciated.
                 disks (see major number 3) except that the limit on
                 partitions is 15.
 
-
 136-143 char    Unix98 PTY slaves
                   0 = /dev/pts/0        First Unix98 pseudo-TTY
                   1 = /dev/pts/1        Second Unix98 pesudo-TTY
@@ -2384,6 +2396,7 @@ Your cooperation is appreciated.
                     ...
 
 159 char        RESERVED
+
 159 block       RESERVED
 
 160 char        General Purpose Instrument Bus (GPIB)
@@ -2427,7 +2440,7 @@ Your cooperation is appreciated.
 
                 Partitions are handled in the same way as for IDE
                 disks (see major number 3) except that the limit on
-                partitions is 31. 
+                partitions is 31.
 
 162 char        Raw block device interface
                   0 = /dev/rawctl       Raw I/O control device
@@ -2483,7 +2496,6 @@ Your cooperation is appreciated.
 
 171 char        Reserved for IEEE 1394 (Firewire)
 
-
 172 char        Moxa Intellio serial card
                   0 = /dev/ttyMX0       First Moxa port
                   1 = /dev/ttyMX1       Second Moxa port
@@ -2543,9 +2555,6 @@ Your cooperation is appreciated.
                  64 = /dev/usb/rio500   Diamond Rio 500
                  65 = /dev/usb/usblcd   USBLCD Interface (info@usblcd.de)
                  66 = /dev/usb/cpad0    Synaptics cPad (mouse/LCD)
-                 67 = /dev/usb/adutux0  1st Ontrak ADU device
-                    ...
-                 76 = /dev/usb/adutux10 10th Ontrak ADU device
                  96 = /dev/usb/hiddev0  1st USB HID device
                     ...
                 111 = /dev/usb/hiddev15 16th USB HID device
@@ -2558,7 +2567,7 @@ Your cooperation is appreciated.
                 132 = /dev/usb/idmouse  ID Mouse (fingerprint scanner) device
                 133 = /dev/usb/sisusbvga1       First SiSUSB VGA device
                     ...
-                140 = /dev/usb/sisusbvga8       Eigth SISUSB VGA device
+                140 = /dev/usb/sisusbvga8       Eighth SISUSB VGA device
                 144 = /dev/usb/lcd      USB LCD device
                 160 = /dev/usb/legousbtower0    1st USB Legotower device
                     ...
@@ -2571,7 +2580,7 @@ Your cooperation is appreciated.
                   0 = /dev/uba          First USB block device
                   8 = /dev/ubb          Second USB block device
                  16 = /dev/ubc          Third USB block device
-                    ...
+                    ...
 
 181 char        Conrad Electronic parallel port radio clocks
                   0 = /dev/pcfclock0    First Conrad radio clock
@@ -2657,7 +2666,7 @@ Your cooperation is appreciated.
                  32 = /dev/mvideo/status2       Third device
                     ...
                     ...
-                240 = /dev/mvideo/status15      16th device 
+                240 = /dev/mvideo/status15      16th device
                     ...
 
 195 char        Nvidia graphics devices
@@ -2795,6 +2804,10 @@ Your cooperation is appreciated.
                     ...
                  185 = /dev/ttyNX15             Hilscher netX serial port 15
                  186 = /dev/ttyJ0               JTAG1 DCC protocol based serial port emulation
+                 187 = /dev/ttyUL0              Xilinx uartlite - port 0
+                    ...
+                 190 = /dev/ttyUL3              Xilinx uartlite - port 3
+                 191 = /dev/xvc0                Xen virtual console - port 0
 
 205 char        Low-density serial ports (alternate device)
                   0 = /dev/culu0                Callout device for ttyLU0
@@ -2832,7 +2845,6 @@ Your cooperation is appreciated.
                  82 = /dev/cuvr0                Callout device for ttyVR0
                  83 = /dev/cuvr1                Callout device for ttyVR1
 
-
 206 char        OnStream SC-x0 tape devices
                   0 = /dev/osst0                First OnStream SCSI tape, mode 0
                   1 = /dev/osst1                Second OnStream SCSI tape, mode 0
@@ -2922,7 +2934,6 @@ Your cooperation is appreciated.
                     ...
 
 212 char        LinuxTV.org DVB driver subsystem
-
                   0 = /dev/dvb/adapter0/video0    first video decoder of first card
                   1 = /dev/dvb/adapter0/audio0    first audio decoder of first card
                   2 = /dev/dvb/adapter0/sec0      (obsolete/unused)
@@ -3008,9 +3019,9 @@ Your cooperation is appreciated.
                   2 = /dev/3270/tub2            Second 3270 terminal
                     ...
 
-229 char        IBM iSeries virtual console
-                  0 = /dev/iseries/vtty0        First console port
-                  1 = /dev/iseries/vtty1        Second console port
+229 char        IBM iSeries/pSeries virtual console
+                  0 = /dev/hvc0                 First console port
+                  1 = /dev/hvc1                 Second console port
                     ...
 
 230 char        IBM iSeries virtual tape
@@ -3083,12 +3094,14 @@ Your cooperation is appreciated.
 234-239         UNASSIGNED
 
 240-254 char    LOCAL/EXPERIMENTAL USE
+
 240-254 block   LOCAL/EXPERIMENTAL USE
                 Allocated for local/experimental use.  For devices not
                 assigned official numbers, these ranges should be
                 used in order to avoid conflicting with future assignments.
 
 255 char        RESERVED
+
 255 block       RESERVED
 
                 This major is reserved to assist the expansion to a
@@ -3115,7 +3128,20 @@ Your cooperation is appreciated.
 257 char        Phoenix Technologies Cryptographic Services Driver
                   0 = /dev/ptlsec       Crypto Services Driver
 
-
+257 block       SSFDC Flash Translation Layer filesystem
+                  0 = /dev/ssfdca       First SSFDC layer
+                  8 = /dev/ssfdcb       Second SSFDC layer
+                 16 = /dev/ssfdcc       Third SSFDC layer
+                 24 = /dev/ssfdcd       4th SSFDC layer
+                 32 = /dev/ssfdce       5th SSFDC layer
+                 40 = /dev/ssfdcf       6th SSFDC layer
+                 48 = /dev/ssfdcg       7th SSFDC layer
+                 56 = /dev/ssfdch       8th SSFDC layer
+
+258 block       ROM/Flash read-only translation layer
+                  0 = /dev/blockrom0    First ROM card's translation layer interface
+                  1 = /dev/blockrom1    Second ROM card's translation layer interface
+                  ...
 
  ****   ADDITIONAL /dev DIRECTORY ENTRIES
 
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index eb1a6cad21e6..790ef6fbe495 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -124,7 +124,7 @@ sync_fs:		no	no	read
 write_super_lockfs:     ?
 unlockfs:               ?
 statfs:                 no      no      no
-remount_fs:             no      yes     maybe           (see below)
+remount_fs:             yes     yes     maybe           (see below)
 clear_inode:            no
 umount_begin:           yes     no      no
 show_options:           no                              (vfsmount->sem)
diff --git a/Documentation/filesystems/fuse.txt b/Documentation/filesystems/fuse.txt
index 3d7447738958..345392c4caeb 100644
--- a/Documentation/filesystems/fuse.txt
+++ b/Documentation/filesystems/fuse.txt
@@ -51,6 +51,22 @@ homepage:
 
   http://fuse.sourceforge.net/
 
+Filesystem type
+~~~~~~~~~~~~~~~
+
+The filesystem type given to mount(2) can be one of the following:
+
+'fuse'
+
+  This is the usual way to mount a FUSE filesystem.  The first
+  argument of the mount system call may contain an arbitrary string,
+  which is not interpreted by the kernel.
+
+'fuseblk'
+
+  The filesystem is block device based.  The first argument of the
+  mount system call is interpreted as the name of the device.
+
 Mount options
 ~~~~~~~~~~~~~
 
@@ -94,6 +110,11 @@ Mount options
   The default is infinite.  Note that the size of read requests is
   limited anyway to 32 pages (which is 128kbyte on i386).
 
+'blksize=N'
+
+  Set the block size for the filesystem.  The default is 512.  This
+  option is only valid for 'fuseblk' type mounts.
+
 Control filesystem
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/Documentation/filesystems/sysv-fs.txt b/Documentation/filesystems/sysv-fs.txt
index d81722418010..253b50d1328e 100644
--- a/Documentation/filesystems/sysv-fs.txt
+++ b/Documentation/filesystems/sysv-fs.txt
@@ -1,11 +1,8 @@
-This is the implementation of the SystemV/Coherent filesystem for Linux.
 It implements all of
   - Xenix FS,
   - SystemV/386 FS,
   - Coherent FS.
 
-This is version beta 4.
-
 To install:
 * Answer the 'System V and Coherent filesystem support' question with 'y'
   when configuring the kernel.
@@ -28,11 +25,173 @@ Bugs in the present implementation:
   for this FS on hard disk yet.
 
 
-Please report any bugs and suggestions to
-  Bruno Haible <haible@ma2s2.mathematik.uni-karlsruhe.de>
-  Pascal Haible <haible@izfm.uni-stuttgart.de>
-  Krzysztof G. Baranowski <kgb@manjak.knm.org.pl>
+These filesystems are rather similar. Here is a comparison with Minix FS:
+
+* Linux fdisk reports on partitions
+  - Minix FS     0x81 Linux/Minix
+  - Xenix FS     ??
+  - SystemV FS   ??
+  - Coherent FS  0x08 AIX bootable
+
+* Size of a block or zone (data allocation unit on disk)
+  - Minix FS     1024
+  - Xenix FS     1024 (also 512 ??)
+  - SystemV FS   1024 (also 512 and 2048)
+  - Coherent FS   512
+
+* General layout: all have one boot block, one super block and
+  separate areas for inodes and for directories/data.
+  On SystemV Release 2 FS (e.g. Microport) the first track is reserved and
+  all the block numbers (including the super block) are offset by one track.
+
+* Byte ordering of "short" (16 bit entities) on disk:
+  - Minix FS     little endian  0 1
+  - Xenix FS     little endian  0 1
+  - SystemV FS   little endian  0 1
+  - Coherent FS  little endian  0 1
+  Of course, this affects only the file system, not the data of files on it!
+
+* Byte ordering of "long" (32 bit entities) on disk:
+  - Minix FS     little endian  0 1 2 3
+  - Xenix FS     little endian  0 1 2 3
+  - SystemV FS   little endian  0 1 2 3
+  - Coherent FS  PDP-11         2 3 0 1
+  Of course, this affects only the file system, not the data of files on it!
+
+* Inode on disk: "short", 0 means non-existent, the root dir ino is:
+  - Minix FS                            1
+  - Xenix FS, SystemV FS, Coherent FS   2
+
+* Maximum number of hard links to a file:
+  - Minix FS     250
+  - Xenix FS     ??
+  - SystemV FS   ??
+  - Coherent FS  >=10000
+
+* Free inode management:
+  - Minix FS                             a bitmap
+  - Xenix FS, SystemV FS, Coherent FS
+      There is a cache of a certain number of free inodes in the super-block.
+      When it is exhausted, new free inodes are found using a linear search.
+
+* Free block management:
+  - Minix FS                             a bitmap
+  - Xenix FS, SystemV FS, Coherent FS
+      Free blocks are organized in a "free list". Maybe a misleading term,
+      since it is not true that every free block contains a pointer to
+      the next free block. Rather, the free blocks are organized in chunks
+      of limited size, and every now and then a free block contains pointers
+      to the free blocks pertaining to the next chunk; the first of these
+      contains pointers and so on. The list terminates with a "block number"
+      0 on Xenix FS and SystemV FS, with a block zeroed out on Coherent FS.
+
+* Super-block location:
+  - Minix FS     block 1 = bytes 1024..2047
+  - Xenix FS     block 1 = bytes 1024..2047
+  - SystemV FS   bytes 512..1023
+  - Coherent FS  block 1 = bytes 512..1023
+
+* Super-block layout:
+  - Minix FS
+                    unsigned short s_ninodes;
+                    unsigned short s_nzones;
+                    unsigned short s_imap_blocks;
+                    unsigned short s_zmap_blocks;
+                    unsigned short s_firstdatazone;
+                    unsigned short s_log_zone_size;
+                    unsigned long s_max_size;
+                    unsigned short s_magic;
+  - Xenix FS, SystemV FS, Coherent FS
+                    unsigned short s_firstdatazone;
+                    unsigned long  s_nzones;
+                    unsigned short s_fzone_count;
+                    unsigned long  s_fzones[NICFREE];
+                    unsigned short s_finode_count;
+                    unsigned short s_finodes[NICINOD];
+                    char           s_flock;
+                    char           s_ilock;
+                    char           s_modified;
+                    char           s_rdonly;
+                    unsigned long  s_time;
+                    short          s_dinfo[4]; -- SystemV FS only
+                    unsigned long  s_free_zones;
+                    unsigned short s_free_inodes;
+                    short          s_dinfo[4]; -- Xenix FS only
+                    unsigned short s_interleave_m,s_interleave_n; -- Coherent FS only
+                    char           s_fname[6];
+                    char           s_fpack[6];
+    then they differ considerably:
+        Xenix FS
+                    char           s_clean;
+                    char           s_fill[371];
+                    long           s_magic;
+                    long           s_type;
+        SystemV FS
+                    long           s_fill[12 or 14];
+                    long           s_state;
+                    long           s_magic;
+                    long           s_type;
+        Coherent FS
+                    unsigned long  s_unique;
+    Note that Coherent FS has no magic.
+
+* Inode layout:
+  - Minix FS
+                    unsigned short i_mode;
+                    unsigned short i_uid;
+                    unsigned long  i_size;
+                    unsigned long  i_time;
+                    unsigned char  i_gid;
+                    unsigned char  i_nlinks;
+                    unsigned short i_zone[7+1+1];
+  - Xenix FS, SystemV FS, Coherent FS
+                    unsigned short i_mode;
+                    unsigned short i_nlink;
+                    unsigned short i_uid;
+                    unsigned short i_gid;
+                    unsigned long  i_size;
+                    unsigned char  i_zone[3*(10+1+1+1)];
+                    unsigned long  i_atime;
+                    unsigned long  i_mtime;
+                    unsigned long  i_ctime;
+
+* Regular file data blocks are organized as
+  - Minix FS
+               7 direct blocks
+               1 indirect block (pointers to blocks)
+               1 double-indirect block (pointer to pointers to blocks)
+  - Xenix FS, SystemV FS, Coherent FS
+              10 direct blocks
+               1 indirect block (pointers to blocks)
+               1 double-indirect block (pointer to pointers to blocks)
+               1 triple-indirect block (pointer to pointers to pointers to blocks)
+
+* Inode size, inodes per block
+  - Minix FS        32   32
+  - Xenix FS        64   16
+  - SystemV FS      64   16
+  - Coherent FS     64    8
+
+* Directory entry on disk
+  - Minix FS
+                    unsigned short inode;
+                    char name[14/30];
+  - Xenix FS, SystemV FS, Coherent FS
+                    unsigned short inode;
+                    char name[14];
+
+* Dir entry size, dir entries per block
+  - Minix FS     16/32    64/32
+  - Xenix FS     16       64
+  - SystemV FS   16       64
+  - Coherent FS  16       32
+
+* How to implement symbolic links such that the host fsck doesn't scream:
+  - Minix FS     normal
+  - Xenix FS     kludge: as regular files with  chmod 1000
+  - SystemV FS   ??
+  - Coherent FS  kludge: as regular files with  chmod 1000
 
-Bruno Haible
-<haible@ma2s2.mathematik.uni-karlsruhe.de>
 
+Notation: We often speak of a "block" but mean a zone (the allocation unit)
+and not the disk driver's notion of "block".
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d34fd6a28faa..b79bcdf16319 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -648,6 +648,10 @@ and is between 256 and 4096 characters. It is defined in the file
         idle=           [HW]
                         Format: idle=poll or idle=halt
 
+        ignore_loglevel [KNL]
+                        Ignore loglevel setting - this will print /all/
+                        kernel messages to the console. Useful for debugging.
+
         ihash_entries=  [KNL]
                         Set number of hash buckets for inode cache.
 
@@ -712,7 +716,12 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: <RDP>,<reset>,<pci_scan>,<verbosity>
 
         isolcpus=       [KNL,SMP] Isolate CPUs from the general scheduler.
-                        Format: <cpu number>,...,<cpu number>
+                        Format:
+                        <cpu number>,...,<cpu number>
+                        or
+                        <cpu number>-<cpu number>  (must be a positive range in ascending order)
+                        or a mixture
+                        <cpu number>,...,<cpu number>-<cpu number>
                         This option can be used to specify one or more CPUs
                         to isolate from the general SMP balancing and scheduling
                         algorithms. The only way to move a process onto or off
@@ -1010,6 +1019,10 @@ and is between 256 and 4096 characters. It is defined in the file
                         emulation library even if a 387 maths coprocessor
                         is present.
 
+        noaliencache    [MM, NUMA] Disables the allcoation of alien caches in
+                        the slab allocator.  Saves per-node memory, but will
+                        impact performance on real NUMA hardware.
+
         noalign         [KNL,ARM]
 
         noapic          [SMP,APIC] Tells the kernel to not make use of any
@@ -1288,6 +1301,7 @@ and is between 256 and 4096 characters. It is defined in the file
                         Param: "schedule" - profile schedule points.
                         Param: <number> - step/bucket size as a power of 2 for
                                 statistical time based profiling.
+                        Param: "sleep" - profile D-state sleeping (millisecs)
 
         processor.max_cstate=   [HW,ACPI]
                         Limit processor to maximum C-state
@@ -1369,6 +1383,12 @@ and is between 256 and 4096 characters. It is defined in the file
         resume=         [SWSUSP]
                         Specify the partition device for software suspend
 
+        resume_offset=  [SWSUSP]
+                        Specify the offset from the beginning of the partition
+                        given by "resume=" at which the swap header is located,
+                        in <PAGE_SIZE> units (needed only for swap files).
+                        See  Documentation/power/swsusp-and-swap-files.txt
+
         rhash_entries=  [KNL,NET]
                         Set number of hash buckets for route cache
 
diff --git a/Documentation/power/s2ram.txt b/Documentation/power/s2ram.txt
new file mode 100644
index 000000000000..b05f512130ea
--- /dev/null
+++ b/Documentation/power/s2ram.txt
@@ -0,0 +1,56 @@
+                        How to get s2ram working
+                        ~~~~~~~~~~~~~~~~~~~~~~~~
+                        2006 Linus Torvalds
+                        2006 Pavel Machek
+
+1) Check suspend.sf.net, program s2ram there has long whitelist of
+   "known ok" machines, along with tricks to use on each one.
+
+2) If that does not help, try reading tricks.txt and
+   video.txt. Perhaps problem is as simple as broken module, and
+   simple module unload can fix it.
+
+3) You can use Linus' TRACE_RESUME infrastructure, described below.
+
+                      Using TRACE_RESUME
+                      ~~~~~~~~~~~~~~~~~~
+
+I've been working at making the machines I have able to STR, and almost
+always it's a driver that is buggy. Thank God for the suspend/resume
+debugging - the thing that Chuck tried to disable. That's often the _only_
+way to debug these things, and it's actually pretty powerful (but
+time-consuming - having to insert TRACE_RESUME() markers into the device
+driver that doesn't resume and recompile and reboot).
+
+Anyway, the way to debug this for people who are interested (have a
+machine that doesn't boot) is:
+
+ - enable PM_DEBUG, and PM_TRACE
+
+ - use a script like this:
+
+        #!/bin/sh
+        sync
+        echo 1 > /sys/power/pm_trace
+        echo mem > /sys/power/state
+
+   to suspend
+
+ - if it doesn't come back up (which is usually the problem), reboot by
+   holding the power button down, and look at the dmesg output for things
+   like
+
+        Magic number: 4:156:725
+        hash matches drivers/base/power/resume.c:28
+        hash matches device 0000:01:00.0
+
+   which means that the last trace event was just before trying to resume
+   device 0000:01:00.0. Then figure out what driver is controlling that
+   device (lspci and /sys/devices/pci* is your friend), and see if you can
+   fix it, disable it, or trace into its resume function.
+
+For example, the above happens to be the VGA device on my EVO, which I
+used to run with "radeonfb" (it's an ATI Radeon mobility). It turns out
+that "radeonfb" simply cannot resume that device - it tries to set the
+PLL's, and it just _hangs_. Using the regular VGA console and letting X
+resume it instead works fine.
diff --git a/Documentation/power/swsusp-and-swap-files.txt b/Documentation/power/swsusp-and-swap-files.txt
new file mode 100644
index 000000000000..06f911a5f885
--- /dev/null
+++ b/Documentation/power/swsusp-and-swap-files.txt
@@ -0,0 +1,60 @@
+Using swap files with software suspend (swsusp)
+        (C) 2006 Rafael J. Wysocki <rjw@sisk.pl>
+
+The Linux kernel handles swap files almost in the same way as it handles swap
+partitions and there are only two differences between these two types of swap
+areas:
+(1) swap files need not be contiguous,
+(2) the header of a swap file is not in the first block of the partition that
+holds it.  From the swsusp's point of view (1) is not a problem, because it is
+already taken care of by the swap-handling code, but (2) has to be taken into
+consideration.
+
+In principle the location of a swap file's header may be determined with the
+help of appropriate filesystem driver.  Unfortunately, however, it requires the
+filesystem holding the swap file to be mounted, and if this filesystem is
+journaled, it cannot be mounted during resume from disk.  For this reason to
+identify a swap file swsusp uses the name of the partition that holds the file
+and the offset from the beginning of the partition at which the swap file's
+header is located.  For convenience, this offset is expressed in <PAGE_SIZE>
+units.
+
+In order to use a swap file with swsusp, you need to:
+
+1) Create the swap file and make it active, eg.
+
+# dd if=/dev/zero of=<swap_file_path> bs=1024 count=<swap_file_size_in_k>
+# mkswap <swap_file_path>
+# swapon <swap_file_path>
+
+2) Use an application that will bmap the swap file with the help of the
+FIBMAP ioctl and determine the location of the file's swap header, as the
+offset, in <PAGE_SIZE> units, from the beginning of the partition which
+holds the swap file.
+
+3) Add the following parameters to the kernel command line:
+
+resume=<swap_file_partition> resume_offset=<swap_file_offset>
+
+where <swap_file_partition> is the partition on which the swap file is located
+and <swap_file_offset> is the offset of the swap header determined by the
+application in 2) (of course, this step may be carried out automatically
+by the same application that determies the swap file's header offset using the
+FIBMAP ioctl)
+
+OR
+
+Use a userland suspend application that will set the partition and offset
+with the help of the SNAPSHOT_SET_SWAP_AREA ioctl described in
+Documentation/power/userland-swsusp.txt (this is the only method to suspend
+to a swap file allowing the resume to be initiated from an initrd or initramfs
+image).
+
+Now, swsusp will use the swap file in the same way in which it would use a swap
+partition.  In particular, the swap file has to be active (ie. be present in
+/proc/swaps) so that it can be used for suspending.
+
+Note that if the swap file used for suspending is deleted and recreated,
+the location of its header need not be the same as before.  Thus every time
+this happens the value of the "resume_offset=" kernel command line parameter
+has to be updated.
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index e635e6f1e316..0761ff6c57ed 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -297,20 +297,12 @@ system is shut down or suspended. Additionally use the encrypted
 suspend image to prevent sensitive data from being stolen after
 resume.
 
-Q: Why can't we suspend to a swap file?
+Q: Can I suspend to a swap file?
 
-A: Because accessing swap file needs the filesystem mounted, and
-filesystem might do something wrong (like replaying the journal)
-during mount.
-
-There are few ways to get that fixed:
-
-1) Probably could be solved by modifying every filesystem to support
-some kind of "really read-only!" option. Patches welcome.
-
-2) suspend2 gets around that by storing absolute positions in on-disk
-image (and blocksize), with resume parameter pointing directly to
-suspend header.
+A: Generally, yes, you can.  However, it requires you to use the "resume=" and
+"resume_offset=" kernel command line parameters, so the resume from a swap file
+cannot be initiated from an initrd or initramfs image.  See
+swsusp-and-swap-files.txt for details.
 
 Q: Is there a maximum system RAM size that is supported by swsusp?
 
diff --git a/Documentation/power/userland-swsusp.txt b/Documentation/power/userland-swsusp.txt
index 64755e9285db..000556c932e9 100644
--- a/Documentation/power/userland-swsusp.txt
+++ b/Documentation/power/userland-swsusp.txt
@@ -9,9 +9,8 @@ done it already.
 Now, to use the userland interface for software suspend you need special
 utilities that will read/write the system memory snapshot from/to the
 kernel.  Such utilities are available, for example, from
-<http://www.sisk.pl/kernel/utilities/suspend>.  You may want to have
-a look at them if you are going to develop your own suspend/resume
-utilities.
+<http://suspend.sourceforge.net>.  You may want to have a look at them if you
+are going to develop your own suspend/resume utilities.
 
 The interface consists of a character device providing the open(),
 release(), read(), and write() operations as well as several ioctl()
@@ -21,9 +20,9 @@ be read from /sys/class/misc/snapshot/dev.
 
 The device can be open either for reading or for writing.  If open for
 reading, it is considered to be in the suspend mode.  Otherwise it is
-assumed to be in the resume mode.  The device cannot be open for reading
-and writing.  It is also impossible to have the device open more than once
-at a time.
+assumed to be in the resume mode.  The device cannot be open for simultaneous
+reading and writing.  It is also impossible to have the device open more than
+once at a time.
 
 The ioctl() commands recognized by the device are:
 
@@ -69,9 +68,46 @@ SNAPSHOT_FREE_SWAP_PAGES - free all swap pages allocated with
 SNAPSHOT_SET_SWAP_FILE - set the resume partition (the last ioctl() argument
         should specify the device's major and minor numbers in the old
         two-byte format, as returned by the stat() function in the .st_rdev
-        member of the stat structure); it is recommended to always use this
-        call, because the code to set the resume partition could be removed from
-        future kernels
+        member of the stat structure)
+
+SNAPSHOT_SET_SWAP_AREA - set the resume partition and the offset (in <PAGE_SIZE>
+        units) from the beginning of the partition at which the swap header is
+        located (the last ioctl() argument should point to a struct
+        resume_swap_area, as defined in kernel/power/power.h, containing the
+        resume device specification, as for the SNAPSHOT_SET_SWAP_FILE ioctl(),
+        and the offset); for swap partitions the offset is always 0, but it is
+        different to zero for swap files (please see
+        Documentation/swsusp-and-swap-files.txt for details).
+        The SNAPSHOT_SET_SWAP_AREA ioctl() is considered as a replacement for
+        SNAPSHOT_SET_SWAP_FILE which is regarded as obsolete.   It is
+        recommended to always use this call, because the code to set the resume
+        partition may be removed from future kernels
+
+SNAPSHOT_S2RAM - suspend to RAM; using this call causes the kernel to
+        immediately enter the suspend-to-RAM state, so this call must always
+        be preceded by the SNAPSHOT_FREEZE call and it is also necessary
+        to use the SNAPSHOT_UNFREEZE call after the system wakes up.  This call
+        is needed to implement the suspend-to-both mechanism in which the
+        suspend image is first created, as though the system had been suspended
+        to disk, and then the system is suspended to RAM (this makes it possible
+        to resume the system from RAM if there's enough battery power or restore
+        its state on the basis of the saved suspend image otherwise)
+
+SNAPSHOT_PMOPS - enable the usage of the pmops->prepare, pmops->enter and
+        pmops->finish methods (the in-kernel swsusp knows these as the "platform
+        method") which are needed on many machines to (among others) speed up
+        the resume by letting the BIOS skip some steps or to let the system
+        recognise the correct state of the hardware after the resume (in
+        particular on many machines this ensures that unplugged AC
+        adapters get correctly detected and that kacpid does not run wild after
+        the resume).  The last ioctl() argument can take one of the three
+        values, defined in kernel/power/power.h:
+        PMOPS_PREPARE - make the kernel carry out the
+                pm_ops->prepare(PM_SUSPEND_DISK) operation
+        PMOPS_ENTER - make the kernel power off the system by calling
+                pm_ops->enter(PM_SUSPEND_DISK)
+        PMOPS_FINISH - make the kernel carry out the
+                pm_ops->finish(PM_SUSPEND_DISK) operation
 
 The device's read() operation can be used to transfer the snapshot image from
 the kernel.  It has the following limitations:
@@ -91,10 +127,12 @@ unfreeze user space processes frozen by SNAPSHOT_UNFREEZE if they are
 still frozen when the device is being closed).
 
 Currently it is assumed that the userland utilities reading/writing the
-snapshot image from/to the kernel will use a swap partition, called the resume
-partition, as storage space.  However, this is not really required, as they
-can use, for example, a special (blank) suspend partition or a file on a partition
-that is unmounted before SNAPSHOT_ATOMIC_SNAPSHOT and mounted afterwards.
+snapshot image from/to the kernel will use a swap parition, called the resume
+partition, or a swap file as storage space (if a swap file is used, the resume
+partition is the partition that holds this file).  However, this is not really
+required, as they can use, for example, a special (blank) suspend partition or
+a file on a partition that is unmounted before SNAPSHOT_ATOMIC_SNAPSHOT and
+mounted afterwards.
 
 These utilities SHOULD NOT make any assumptions regarding the ordering of
 data within the snapshot image, except for the image header that MAY be