Merge branch 'imx/dt' into next/dt

author: Arnd Bergmann <arnd@arndb.de> 2011-07-28 11:25:46 -0400
committer: Arnd Bergmann <arnd@arndb.de> 2011-07-28 11:25:46 -0400
commit: 6124a4e430b64d1577438c8648c59e996d02e73e (patch)
tree: 49cfafad785d1c9e403a5b0d755298b9af2c260f /Documentation
parent: 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff)
parent: 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff)
53 files changed, 801 insertions, 357 deletions
diff --git a/Documentation/ABI/obsolete/proc-pid-oom_adj b/Documentation/ABI/obsolete/proc-pid-oom_adj
index cf63f264ce0f..9a3cb88ade47 100644
--- a/Documentation/ABI/obsolete/proc-pid-oom_adj
+++ b/Documentation/ABI/obsolete/proc-pid-oom_adj
@@ -14,7 +14,7 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
        A much more powerful interface, /proc/<pid>/oom_score_adj, was
        introduced with the oom killer rewrite that allows users to increase or
-        decrease the badness() score linearly.  This interface will replace
+        decrease the badness score linearly.  This interface will replace
        /proc/<pid>/oom_adj.
        A warning will be emitted to the kernel log if an application uses this
diff --git a/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 b/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
new file mode 100644
index 000000000000..9de269bb0ae5
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
@@ -0,0 +1,21 @@
+What:           /sys/bus/i2c/devices/.../device
+Date:           February 2011
+Contact:        Minkyu Kang <mk7.kang@samsung.com>
+Description:
+                show what device is attached
+                NONE - no device
+                USB - USB device is attached
+                UART - UART is attached
+                CHARGER - Charger is attaced
+                JIG - JIG is attached
+What:           /sys/bus/i2c/devices/.../switch
+Date:           February 2011
+Contact:        Minkyu Kang <mk7.kang@samsung.com>
+Description:
+                show or set the state of manual switch
+                VAUDIO - switch to VAUDIO path
+                UART - switch to UART path
+                AUDIO - switch to AUDIO path
+                DHOST - switch to DHOST path
+                AUTO - switch automatically by device
diff --git a/Documentation/ABI/testing/sysfs-module b/Documentation/ABI/testing/sysfs-module
index cfcec3bffc0a..9489ea8e294c 100644
--- a/Documentation/ABI/testing/sysfs-module
+++ b/Documentation/ABI/testing/sysfs-module
@@ -10,3 +10,26 @@ KernelVersion:	2.6.35
 Contact:        masa-korg@dsn.okisemi.com
 Description:    Write/read Option ROM data.
+What:           /sys/module/ehci_hcd/drivers/.../uframe_periodic_max
+Date:           July 2011
+KernelVersion:  3.1
+Contact:        Kirill Smelkov <kirr@mns.spb.ru>
+Description:    Maximum time allowed for periodic transfers per microframe (μs)
+                [ USB 2.0 sets maximum allowed time for periodic transfers per
+                  microframe to be 80%, that is 100 microseconds out of 125
+                  microseconds (full microframe).
+                  However there are cases, when 80% max isochronous bandwidth is
+                  too limiting. For example two video streams could require 110
+                  microseconds of isochronous bandwidth per microframe to work
+                  together. ]
+                Through this setting it is possible to raise the limit so that
+                the host controller would allow allocating more than 100
+                microseconds of periodic bandwidth per microframe.
+                Beware, non-standard modes are usually not thoroughly tested by
+                hardware designers, and the hardware can malfunction when this
+                setting differ from default 100.
diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
index d568bc235bc0..a0b6250add79 100644
--- a/Documentation/DMA-API-HOWTO.txt
+++ b/Documentation/DMA-API-HOWTO.txt
@@ -613,13 +613,13 @@ to use the dma_sync_*() interfaces.
                                pass_to_upper_layers(cp->rx_buf);
                                make_and_setup_new_rx_buf(cp);
                        } else {
-                                /* Just sync the buffer and give it back
+                                /* CPU should not write to
-                                 * to the card.
+                                 * DMA_FROM_DEVICE-mapped area,
+                                 * so dma_sync_single_for_device() is
+                                 * not needed here. It would be required
+                                 * for DMA_BIDIRECTIONAL mapping if
+                                 * the memory was modified.
                                 */
-                                dma_sync_single_for_device(&cp->dev,
-                                                           cp->rx_dma,
-                                                           cp->rx_len,
-                                                           DMA_FROM_DEVICE);
                                give_rx_buf_to_card(cp);
                        }
                }
diff --git a/Documentation/DocBook/v4l/io.xml b/Documentation/DocBook/v4l/io.xml
index 227e7ac45a06..c57d1ec6291c 100644
--- a/Documentation/DocBook/v4l/io.xml
+++ b/Documentation/DocBook/v4l/io.xml
@@ -210,7 +210,7 @@ for (i = 0; i &lt; reqbuf.count; i++)
      <programlisting>
 &v4l2-requestbuffers; reqbuf;
 /* Our current format uses 3 planes per buffer */
-#define FMT_NUM_PLANES = 3;
+#define FMT_NUM_PLANES = 3
 struct {
        void *start[FMT_NUM_PLANES];
diff --git a/Documentation/RCU/NMI-RCU.txt b/Documentation/RCU/NMI-RCU.txt
index a8536cb88091..bf82851a0e57 100644
--- a/Documentation/RCU/NMI-RCU.txt
+++ b/Documentation/RCU/NMI-RCU.txt
@@ -5,8 +5,8 @@ Although RCU is usually used to protect read-mostly data structures,
 it is possible to use RCU to provide dynamic non-maskable interrupt
 handlers, as well as dynamic irq handlers.  This document describes
 how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer
-work in "arch/i386/oprofile/nmi_timer_int.c" and in
+work in "arch/x86/oprofile/nmi_timer_int.c" and in
-"arch/i386/kernel/traps.c".
+"arch/x86/kernel/traps.c".
 The relevant pieces of code are listed below, each followed by a
 brief explanation.
diff --git a/Documentation/SubmitChecklist b/Documentation/SubmitChecklist
index 7b13be41c085..dc0e33210d7e 100644
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
@@ -53,8 +53,8 @@ kernel patches.
 12: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,
    CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,
-    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP all simultaneously
+    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP, CONFIG_PROVE_RCU
-    enabled.
+    and CONFIG_DEBUG_OBJECTS_RCU_HEAD all simultaneously enabled.
 13: Has been build- and runtime tested with and without CONFIG_SMP and
    CONFIG_PREEMPT.
diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt
index c12bfc1a00c9..359587b2367b 100644
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
@@ -8,10 +8,13 @@ Introduction
  The Samsung S3C24XX range of ARM9 System-on-Chip CPUs are supported
  by the 's3c2410' architecture of ARM Linux. Currently the S3C2410,
-  S3C2412, S3C2413, S3C2416 S3C2440, S3C2442, S3C2443 and S3C2450 devices
+  S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443 and S3C2450 devices
  are supported.
-  Support for the S3C2400 and S3C24A0 series are in progress.
+  Support for the S3C2400 and S3C24A0 series was never completed and the
+  corresponding code has been removed after a while.  If someone wishes to
+  revive this effort, partial support can be retrieved from earlier Linux
+  versions.
  The S3C2416 and S3C2450 devices are very similar and S3C2450 support is
  included under the arch/arm/mach-s3c2416 directory. Note, whilst core
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt
index f65274081c8d..d8147b336c35 100644
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
@@ -45,9 +45,13 @@ device.
 rq_affinity (RW)
 ----------------
-If this option is enabled, the block layer will migrate request completions
+If this option is '1', the block layer will migrate request completions to the
-to the CPU that originally submitted the request. For some workloads
+cpu "group" that originally submitted the request. For some workloads this
-this provides a significant reduction in CPU cycles due to caching effects.
+provides a significant reduction in CPU cycles due to caching effects.
+For storage configurations that need to maximize distribution of completion
+processing setting this option to '2' forces the completion to run on the
+requesting cpu (bypassing the "group" aggregation logic).
 scheduler (RW)
 --------------
diff --git a/Documentation/blockdev/README.DAC960 b/Documentation/blockdev/README.DAC960
index 0e8f618ab534..bd85fb9dc6e5 100644
--- a/Documentation/blockdev/README.DAC960
+++ b/Documentation/blockdev/README.DAC960
@@ -214,7 +214,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
  make config
  make bzImage (or zImage)
-Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your
+Then install "arch/x86/boot/bzImage" or "arch/x86/boot/zImage" as your
 standard kernel, run lilo if appropriate, and reboot.
 To create the necessary devices in /dev, the "make_rd" script included in
diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/blockdev/ramdisk.txt
index 6c820baa19a6..fa72e97dd669 100644
--- a/Documentation/blockdev/ramdisk.txt
+++ b/Documentation/blockdev/ramdisk.txt
@@ -64,9 +64,9 @@ the RAM disk dynamically grows as data is being written into it, a size field
 is not required. Bits 11 to 13 are not currently used and may as well be zero.
 These numbers are no magical secrets, as seen below:
-./arch/i386/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK     0x07FF
+./arch/x86/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK     0x07FF
-./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000
+./arch/x86/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000
-./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000
+./arch/x86/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000
 Consider a typical two floppy disk setup, where you will have the
 kernel on disk one, and have already put a RAM disk image onto disk #2.
@@ -85,7 +85,7 @@ The command line equivalent is: "prompt_ramdisk=1"
 Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word.
 So to create disk one of the set, you would do:
-        /usr/src/linux# cat arch/i386/boot/zImage > /dev/fd0
+        /usr/src/linux# cat arch/x86/boot/zImage > /dev/fd0
        /usr/src/linux# rdev /dev/fd0 /dev/fd0
        /usr/src/linux# rdev -r /dev/fd0 49152
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index 06eb6d957c83..6f3c598971fc 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -380,7 +380,7 @@ will be charged as a new owner of it.
 5.2 stat file
-memory.stat file includes following statistics
+5.2.1 memory.stat file includes following statistics
 # per-memory cgroup local status
 cache           - # of bytes of page cache memory.
@@ -438,6 +438,89 @@ Note:
         file_mapped is accounted only when the memory cgroup is owner of page
         cache.)
+5.2.2 memory.vmscan_stat
+memory.vmscan_stat includes statistics information for memory scanning and
+freeing, reclaiming. The statistics shows memory scanning information since
+memory cgroup creation and can be reset to 0 by writing 0 as
+ #echo 0 > ../memory.vmscan_stat
+This file contains following statistics.
+[param]_[file_or_anon]_pages_by_[reason]_[under_heararchy]
+[param]_elapsed_ns_by_[reason]_[under_hierarchy]
+For example,
+  scanned_file_pages_by_limit indicates the number of scanned
+  file pages at vmscan.
+Now, 3 parameters are supported
+  scanned - the number of pages scanned by vmscan
+  rotated - the number of pages activated at vmscan
+  freed   - the number of pages freed by vmscan
+If "rotated" is high against scanned/freed, the memcg seems busy.
+Now, 2 reason are supported
+  limit - the memory cgroup's limit
+  system - global memory pressure + softlimit
+           (global memory pressure not under softlimit is not handled now)
+When under_hierarchy is added in the tail, the number indicates the
+total memcg scan of its children and itself.
+elapsed_ns is a elapsed time in nanosecond. This may include sleep time
+and not indicates CPU usage. So, please take this as just showing
+latency.
+Here is an example.
+# cat /cgroup/memory/A/memory.vmscan_stat
+scanned_pages_by_limit 9471864
+scanned_anon_pages_by_limit 6640629
+scanned_file_pages_by_limit 2831235
+rotated_pages_by_limit 4243974
+rotated_anon_pages_by_limit 3971968
+rotated_file_pages_by_limit 272006
+freed_pages_by_limit 2318492
+freed_anon_pages_by_limit 962052
+freed_file_pages_by_limit 1356440
+elapsed_ns_by_limit 351386416101
+scanned_pages_by_system 0
+scanned_anon_pages_by_system 0
+scanned_file_pages_by_system 0
+rotated_pages_by_system 0
+rotated_anon_pages_by_system 0
+rotated_file_pages_by_system 0
+freed_pages_by_system 0
+freed_anon_pages_by_system 0
+freed_file_pages_by_system 0
+elapsed_ns_by_system 0
+scanned_pages_by_limit_under_hierarchy 9471864
+scanned_anon_pages_by_limit_under_hierarchy 6640629
+scanned_file_pages_by_limit_under_hierarchy 2831235
+rotated_pages_by_limit_under_hierarchy 4243974
+rotated_anon_pages_by_limit_under_hierarchy 3971968
+rotated_file_pages_by_limit_under_hierarchy 272006
+freed_pages_by_limit_under_hierarchy 2318492
+freed_anon_pages_by_limit_under_hierarchy 962052
+freed_file_pages_by_limit_under_hierarchy 1356440
+elapsed_ns_by_limit_under_hierarchy 351386416101
+scanned_pages_by_system_under_hierarchy 0
+scanned_anon_pages_by_system_under_hierarchy 0
+scanned_file_pages_by_system_under_hierarchy 0
+rotated_pages_by_system_under_hierarchy 0
+rotated_anon_pages_by_system_under_hierarchy 0
+rotated_file_pages_by_system_under_hierarchy 0
+freed_pages_by_system_under_hierarchy 0
+freed_anon_pages_by_system_under_hierarchy 0
+freed_file_pages_by_system_under_hierarchy 0
+elapsed_ns_by_system_under_hierarchy 0
 5.3 swappiness
 Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
diff --git a/Documentation/cpu-freq/cpu-drivers.txt b/Documentation/cpu-freq/cpu-drivers.txt
index 6c30e930c122..c436096351f8 100644
--- a/Documentation/cpu-freq/cpu-drivers.txt
+++ b/Documentation/cpu-freq/cpu-drivers.txt
@@ -168,7 +168,7 @@ in-chipset dynamic frequency switching to policy->min, the upper limit
 to policy->max, and -if supported- select a performance-oriented
 setting when policy->policy is CPUFREQ_POLICY_PERFORMANCE, and a
 powersaving-oriented setting when CPUFREQ_POLICY_POWERSAVE. Also check
-the reference implementation in arch/i386/kernel/cpu/cpufreq/longrun.c
+the reference implementation in drivers/cpufreq/longrun.c
diff --git a/Documentation/devicetree/bindings/arm/sirf.txt b/Documentation/devicetree/bindings/arm/sirf.txt
new file mode 100644
index 000000000000..6b07f65b32de
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/sirf.txt
@@ -0,0 +1,3 @@
+prima2 "cb" evalutation board
+Required root node properties:
+    - compatible = "sirf,prima2-cb", "sirf,prima2";
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
new file mode 100644
index 000000000000..6f1ed830b4f7
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -0,0 +1,7 @@
+Xilinx Zynq EP107 Emulation Platform board
+This board is an emulation platform for the Zynq product which is
+based on an ARM Cortex A9 processor.
+Required root node properties:
+    - compatible = "xlnx,zynq-ep107";
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
new file mode 100644
index 000000000000..d1e3f443e205
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -0,0 +1,17 @@
+* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
+Required properties:
+- compatible : Should be "fsl,<chip>-sdma"
+- reg : Should contain SDMA registers location and length
+- interrupts : Should contain SDMA interrupt
+- fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM
+  scripts firmware
+Examples:
+sdma@83fb0000 {
+        compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
+        reg = <0x83fb0000 0x4000>;
+        interrupts = <6>;
+        fsl,sdma-ram-script-name = "sdma-imx51.bin";
+};
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
new file mode 100644
index 000000000000..ab22fe6e73ab
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
@@ -0,0 +1,34 @@
+* Freescale Enhanced Secure Digital Host Controller (eSDHC) for i.MX
+The Enhanced Secure Digital Host Controller on Freescale i.MX family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+Required properties:
+- compatible : Should be "fsl,<chip>-esdhc"
+- reg : Should contain eSDHC registers location and length
+- interrupts : Should contain eSDHC interrupt
+Optional properties:
+- fsl,card-wired : Indicate the card is wired to host permanently
+- fsl,cd-internal : Indicate to use controller internal card detection
+- fsl,wp-internal : Indicate to use controller internal write protection
+- cd-gpios : Specify GPIOs for card detection
+- wp-gpios : Specify GPIOs for write protection
+Examples:
+esdhc@70004000 {
+        compatible = "fsl,imx51-esdhc";
+        reg = <0x70004000 0x4000>;
+        interrupts = <1>;
+        fsl,cd-internal;
+        fsl,wp-internal;
+};
+esdhc@70008000 {
+        compatible = "fsl,imx51-esdhc";
+        reg = <0x70008000 0x4000>;
+        interrupts = <2>;
+        cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
+        wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
+};
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
index 1a729f089866..1a729f089866 100755..100644
--- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
new file mode 100644
index 000000000000..de439517dff0
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
@@ -0,0 +1,24 @@
+* Freescale Fast Ethernet Controller (FEC)
+Required properties:
+- compatible : Should be "fsl,<soc>-fec"
+- reg : Address and length of the register set for the device
+- interrupts : Should contain fec interrupt
+- phy-mode : String, operation mode of the PHY interface.
+  Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii",
+  "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".
+- phy-reset-gpios : Should specify the gpio for phy reset
+Optional properties:
+- local-mac-address : 6 bytes, mac address
+Example:
+fec@83fec000 {
+        compatible = "fsl,imx51-fec", "fsl,imx27-fec";
+        reg = <0x83fec000 0x4000>;
+        interrupts = <87>;
+        phy-mode = "mii";
+        phy-reset-gpios = <&gpio1 14 0>; /* GPIO2_14 */
+        local-mac-address = [00 04 9F 01 1B B9];
+};
diff --git a/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt b/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt
new file mode 100644
index 000000000000..a2891ceb6344
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/olpc-xo1-rtc.txt
@@ -0,0 +1,5 @@
+OLPC XO-1 RTC
+~~~~~~~~~~~~~
+Required properties:
+ - compatible : "olpc,xo1-rtc"
diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
new file mode 100644
index 000000000000..a9c0406280e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
@@ -0,0 +1,19 @@
+* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART)
+Required properties:
+- compatible : Should be "fsl,<soc>-uart"
+- reg : Address and length of the register set for the device
+- interrupts : Should contain uart interrupt
+Optional properties:
+- fsl,uart-has-rtscts : Indicate the uart has rts and cts
+- fsl,irda-mode : Indicate the uart supports irda mode
+Example:
+uart@73fbc000 {
+        compatible = "fsl,imx51-uart", "fsl,imx21-uart";
+        reg = <0x73fbc000 0x4000>;
+        interrupts = <31>;
+        fsl,uart-has-rtscts;
+};
diff --git a/Documentation/driver-model/device.txt b/Documentation/driver-model/device.txt
index b2ff42685bcb..bdefe728a737 100644
--- a/Documentation/driver-model/device.txt
+++ b/Documentation/driver-model/device.txt
@@ -104,4 +104,4 @@ Then in the module init function is would do:
 And assuming 'dev' is the struct device passed into the probe hook, the driver
 probe function would do something like:
-        create_device(&mydriver_class, dev, chrdev, &private_data, "my_name");
+        device_create(&mydriver_class, dev, chrdev, &private_data, "my_name");
diff --git a/Documentation/driver-model/overview.txt b/Documentation/driver-model/overview.txt
index 07236ed968da..6a8f9a8075d8 100644
--- a/Documentation/driver-model/overview.txt
+++ b/Documentation/driver-model/overview.txt
@@ -30,7 +30,7 @@ management, and hot plug. In particular, the model dictated by Intel and
 Microsoft (namely ACPI) ensures that almost every device on almost any bus
 on an x86-compatible system can work within this paradigm.  Of course,
 not every bus is able to support all such operations, although most
-buses support a most of those operations.
+buses support most of those operations.
 Downstream Access
@@ -46,25 +46,29 @@ struct pci_dev now looks like this:
 struct pci_dev {
        ...
-        struct device dev;
+        struct device dev;     /* Generic device interface */
+        ...
 };
-Note first that it is statically allocated. This means only one allocation on
+Note first that the struct device dev within the struct pci_dev is
-device discovery. Note also that it is at the _end_ of struct pci_dev. This is
+statically allocated. This means only one allocation on device discovery.
-to make people think about what they're doing when switching between the bus
-driver and the global driver; and to prevent against mindless casts between
+Note also that that struct device dev is not necessarily defined at the
-the two.
+front of the pci_dev structure.  This is to make people think about what
+they're doing when switching between the bus driver and the global driver,
+and to discourage meaningless and incorrect casts between the two.
 The PCI bus layer freely accesses the fields of struct device. It knows about
 the structure of struct pci_dev, and it should know the structure of struct
 device. Individual PCI device drivers that have been converted to the current
 driver model generally do not and should not touch the fields of struct device,
-unless there is a strong compelling reason to do so.
+unless there is a compelling reason to do so.
-This abstraction is prevention of unnecessary pain during transitional phases.
+The above abstraction prevents unnecessary pain during transitional phases.
-If the name of the field changes or is removed, then every downstream driver
+If it were not done this way, then when a field was renamed or removed, every
-will break. On the other hand, if only the bus layer (and not the device
+downstream driver would break.  On the other hand, if only the bus layer
-layer) accesses struct device, it is only that layer that needs to change.
+(and not the device layer) accesses the struct device, it is only the bus
+layer that needs to change.
 User Interface
@@ -73,15 +77,27 @@ User Interface
 By virtue of having a complete hierarchical view of all the devices in the
 system, exporting a complete hierarchical view to userspace becomes relatively
 easy. This has been accomplished by implementing a special purpose virtual
-file system named sysfs. It is hence possible for the user to mount the
+file system named sysfs.
-whole sysfs filesystem anywhere in userspace.
+Almost all mainstream Linux distros mount this filesystem automatically; you
+can see some variation of the following in the output of the "mount" command:
+$ mount
+...
+none on /sys type sysfs (rw,noexec,nosuid,nodev)
+...
+$
+The auto-mounting of sysfs is typically accomplished by an entry similar to
+the following in the /etc/fstab file:
+none            /sys    sysfs    defaults               0 0
-This can be done permanently by providing the following entry into the
+or something similar in the /lib/init/fstab file on Debian-based systems:
-/etc/fstab (under the provision that the mount point does exist, of course):
-none            /sys    sysfs    defaults               0       0
+none            /sys    sysfs    nodev,noexec,nosuid    0 0
-Or by hand on the command line:
+If sysfs is not automatically mounted, you can always do it manually with:
 # mount -t sysfs sysfs /sys
diff --git a/Documentation/fb/modedb.txt b/Documentation/fb/modedb.txt
index ec4dee75a354..16aa08453911 100644
--- a/Documentation/fb/modedb.txt
+++ b/Documentation/fb/modedb.txt
@@ -20,7 +20,7 @@ in a video= option, fbmem considers that to be a global video mode option.
 Valid mode specifiers (mode_option argument):
-    <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m]
+    <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
    <name>[-<bpp>][@<refresh>]
 with <xres>, <yres>, <bpp> and <refresh> decimal numbers and <name> a string.
@@ -36,6 +36,21 @@ pixels and 1.8% of yres).
       Sample usage: 1024x768M@60m - CVT timing with margins
+DRM drivers also add options to enable or disable outputs:
+'e' will force the display to be enabled, i.e. it will override the detection
+if a display is connected. 'D' will force the display to be enabled and use
+digital output. This is useful for outputs that have both analog and digital
+signals (e.g. HDMI and DVI-I). For other outputs it behaves like 'e'. If 'd'
+is specified the output is disabled.
+You can additionally specify which output the options matches to.
+To force the VGA output to be enabled and drive a specific mode say:
+    video=VGA-1:1280x1024@60me
+Specifying the option multiple times for different ports is possible, e.g.:
+    video=LVDS-1:d video=HDMI-1:D
 ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo *****
 What is the VESA(TM) Coordinated Video Timings (CVT)?
@@ -132,5 +147,5 @@ There may be more modes.
    tridentfb   - Trident (Cyber)blade chipset frame buffer
    vt8623fb    - VIA 8623 frame buffer
-BTW, only a few drivers use this at the moment. Others are to follow
+BTW, only a few fb drivers use this at the moment. Others are to follow
-(feel free to send patches).
+(feel free to send patches). The DRM drivers also support this.
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index d59e71df5c5c..dfd6a9f4a583 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -184,7 +184,7 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
        A much more powerful interface, /proc/<pid>/oom_score_adj, was
        introduced with the oom killer rewrite that allows users to increase or
-        decrease the badness() score linearly.  This interface will replace
+        decrease the badness score linearly.  This interface will replace
        /proc/<pid>/oom_adj.
        A warning will be emitted to the kernel log if an application uses this
@@ -193,20 +193,6 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
 ---------------------------
-What:   CS5535/CS5536 obsolete GPIO driver
-When:   June 2011
-Files:  drivers/staging/cs5535_gpio/*
-Check:  drivers/staging/cs5535_gpio/cs5535_gpio.c
-Why:    A newer driver replaces this; it is drivers/gpio/cs5535-gpio.c, and
-        integrates with the Linux GPIO subsystem.  The old driver has been
-        moved to staging, and will be removed altogether around 2.6.40.
-        Please test the new driver, and ensure that the functionality you
-        need and any bugfixes from the old driver are available in the new
-        one.
-Who:    Andres Salomon <dilinger@queued.net>
--------------------------
 What:   remove EXPORT_SYMBOL(kernel_thread)
 When:   August 2006
 Files:  arch/*/kernel/*_ksyms.c
@@ -294,7 +280,7 @@ When:	The schedule was July 2008, but it was decided that we are going to keep t
 Why:    The support code for the old firmware hurts code readability/maintainability
        and slightly hurts runtime performance. Bugfixes for the old firmware
        are not provided by Broadcom anymore.
-Who:    Michael Buesch <mb@bu3sch.de>
+Who:    Michael Buesch <m@bues.ch>
 ---------------------------
@@ -430,7 +416,7 @@ Who:	Avi Kivity <avi@redhat.com>
 ----------------------------
 What:   iwlwifi 50XX module parameters
-When:   2.6.40
+When:   3.0
 Why:    The "..50" modules parameters were used to configure 5000 series and
        up devices; different set of module parameters also available for 4965
        with same functionalities. Consolidate both set into single place
@@ -441,7 +427,7 @@ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 ----------------------------
 What:   iwl4965 alias support
-When:   2.6.40
+When:   3.0
 Why:    Internal alias support has been present in module-init-tools for some
        time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
        with no impact.
@@ -474,15 +460,8 @@ Who:	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
 ----------------------------
-What:   DMA_xxBIT_MASK macros
-When:   Jun 2011
-Why:    DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
-Who:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
----------------------------
 What:   iwlwifi disable_hw_scan module parameters
-When:   2.6.40
+When:   3.0
 Why:    Hareware scan is the prefer method for iwlwifi devices for
        scanning operation. Remove software scan support for all the
        iwlwifi devices.
@@ -491,16 +470,6 @@ Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>
 ----------------------------
-What:   access to nfsd auth cache through sys_nfsservctl or '.' files
-        in the 'nfsd' filesystem.
-When:   2.6.40
-Why:    This is a legacy interface which have been replaced by a more
-        dynamic cache.  Continuing to maintain this interface is an
-        unnecessary burden.
-Who:    NeilBrown <neilb@suse.de>
----------------------------
 What:   Legacy, non-standard chassis intrusion detection interface.
 When:   June 2011
 Why:    The adm9240, w83792d and w83793 hardware monitoring drivers have
@@ -518,22 +487,6 @@ Files:	net/netfilter/xt_connlimit.c
 ----------------------------
-What:   noswapaccount kernel command line parameter
-When:   2.6.40
-Why:    The original implementation of memsw feature enabled by
-        CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
-        kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
-        turned out to be not ideal because we cannot have the feature compiled
-        in and disabled by default and let only interested to enable it
-        (e.g. general distribution kernels might need it). Therefore we have
-        added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides
-        the both possibilities. If we remove noswapaccount we will have
-        less command line parameters with the same functionality and we
-        can also cleanup the parameter handling a bit ().
-Who:    Michal Hocko <mhocko@suse.cz>
----------------------------
 What:   ipt_addrtype match include file
 When:   2012
 Why:    superseded by xt_addrtype
@@ -552,7 +505,7 @@ Who:	Jean Delvare <khali@linux-fr.org>
 ----------------------------
 What:   Support for UVCIOC_CTRL_ADD in the uvcvideo driver
-When:   2.6.42
+When:   3.2
 Why:    The information passed to the driver by this ioctl is now queried
        dynamically from the device.
 Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -560,7 +513,7 @@ Who:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 ----------------------------
 What:   Support for UVCIOC_CTRL_MAP_OLD in the uvcvideo driver
-When:   2.6.42
+When:   3.2
 Why:    Used only by applications compiled against older driver versions.
        Superseded by UVCIOC_CTRL_MAP which supports V4L2 menu controls.
 Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -568,7 +521,7 @@ Who:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 ----------------------------
 What:   Support for UVCIOC_CTRL_GET and UVCIOC_CTRL_SET in the uvcvideo driver
-When:   2.6.42
+When:   3.2
 Why:    Superseded by the UVCIOC_CTRL_QUERY ioctl.
 Who:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -595,3 +548,10 @@ Why:	Just opening a V4L device should not change the state of the hardware
 Who:    Hans Verkuil <hans.verkuil@cisco.com>
 ----------------------------
+What:   g_file_storage driver
+When:   3.8
+Why:    This driver has been superseded by g_mass_storage.
+Who:    Alan Stern <stern@rowland.harvard.edu>
+----------------------------
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index ca7e25292542..653380793a6c 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -52,7 +52,7 @@ ata *);
        void (*put_link) (struct dentry *, struct nameidata *, void *);
        void (*truncate) (struct inode *);
        int (*permission) (struct inode *, int, unsigned int);
-        int (*check_acl)(struct inode *, int);
+        int (*get_acl)(struct inode *, int);
        int (*setattr) (struct dentry *, struct iattr *);
        int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);
        int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
@@ -80,7 +80,7 @@ put_link:	no
 truncate:       yes             (see below)
 setattr:        yes
 permission:     no (may not block if called in rcu-walk mode)
-check_acl:      no
+get_acl:        no
 getattr:        no
 setxattr:       yes
 getxattr:       no
@@ -338,21 +338,21 @@ fl_release_private:	maybe		no
 ----------------------- lock_manager_operations ---------------------------
 prototypes:
-        int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
+        int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
-        void (*fl_notify)(struct file_lock *);  /* unblock callback */
+        void (*lm_notify)(struct file_lock *);  /* unblock callback */
-        int (*fl_grant)(struct file_lock *, struct file_lock *, int);
+        int (*lm_grant)(struct file_lock *, struct file_lock *, int);
-        void (*fl_release_private)(struct file_lock *);
+        void (*lm_release_private)(struct file_lock *);
-        void (*fl_break)(struct file_lock *); /* break_lease callback */
+        void (*lm_break)(struct file_lock *); /* break_lease callback */
-        int (*fl_change)(struct file_lock **, int);
+        int (*lm_change)(struct file_lock **, int);
 locking rules:
                        file_lock_lock  may block
-fl_compare_owner:       yes             no
+lm_compare_owner:       yes             no
-fl_notify:              yes             no
+lm_notify:              yes             no
-fl_grant:               no              no
+lm_grant:               no              no
-fl_release_private:     maybe           no
+lm_release_private:     maybe           no
-fl_break:               yes             no
+lm_break:               yes             no
-fl_change               yes             no
+lm_change               yes             no
 --------------------------- buffer_head -----------------------------------
 prototypes:
diff --git a/Documentation/filesystems/debugfs.txt b/Documentation/filesystems/debugfs.txt
index ed52af60c2d8..742cc06e138f 100644
--- a/Documentation/filesystems/debugfs.txt
+++ b/Documentation/filesystems/debugfs.txt
@@ -73,8 +73,8 @@ the following functions can be used instead:
                                      struct dentry *parent, u16 *value);
    struct dentry *debugfs_create_x32(const char *name, mode_t mode,
                                      struct dentry *parent, u32 *value);
+    struct dentry *debugfs_create_x64(const char *name, mode_t mode,
-Note that there is no debugfs_create_x64().
+                                      struct dentry *parent, u64 *value);
 These functions are useful as long as the developer knows the size of the
 value to be exported.  Some types can have different widths on different
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt
index 272f80d5f966..22f3a0eda1d2 100644
--- a/Documentation/filesystems/ext3.txt
+++ b/Documentation/filesystems/ext3.txt
@@ -147,15 +147,6 @@ grpjquota=<file>	during journal replay. They replace the above
                        package for more details
                        (http://sourceforge.net/projects/linuxquota).
-bh              (*)     ext3 associates buffer heads to data pages to
-nobh                    (a) cache disk block mapping information
-                        (b) link pages into transaction to provide
-                            ordering guarantees.
-                        "bh" option forces use of buffer heads.
-                        "nobh" option tries to avoid associating buffer
-                        heads (supported only for "writeback" mode).
 Specification
 =============
 Ext3 shares all disk implementation with the ext2 filesystem, and adds
@@ -227,5 +218,5 @@ kernel source:	<file:fs/ext3/>
 programs:       http://e2fsprogs.sourceforge.net/
                http://ext2resize.sourceforge.net
-useful links:   http://www.ibm.com/developerworks/library/l-fs7.html
+useful links:   http://www.ibm.com/developerworks/library/l-fs7/index.html
-                http://www.ibm.com/developerworks/library/l-fs8.html
+        http://www.ibm.com/developerworks/library/l-fs8/index.html
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 3ae9bc94352a..232a575a0c48 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -68,12 +68,12 @@ Note: More extensive information for getting started with ext4 can be
    '-o barriers=[0|1]' mount option for both ext3 and ext4 filesystems
    for a fair comparison.  When tuning ext3 for best benchmark numbers,
    it is often worthwhile to try changing the data journaling mode; '-o
-    data=writeback,nobh' can be faster for some workloads.  (Note
+    data=writeback' can be faster for some workloads.  (Note however that
-    however that running mounted with data=writeback can potentially
+    running mounted with data=writeback can potentially leave stale data
-    leave stale data exposed in recently written files in case of an
+    exposed in recently written files in case of an unclean shutdown,
-    unclean shutdown, which could be a security exposure in some
+    which could be a security exposure in some situations.)  Configuring
-    situations.)  Configuring the filesystem with a large journal can
+    the filesystem with a large journal can also be helpful for
-    also be helpful for metadata-intensive workloads.
+    metadata-intensive workloads.
 2. Features
 ===========
@@ -272,14 +272,6 @@ grpjquota=<file>	during journal replay. They replace the above
                        package for more details
                        (http://sourceforge.net/projects/linuxquota).
-bh              (*)     ext4 associates buffer heads to data pages to
-nobh                    (a) cache disk block mapping information
-                        (b) link pages into transaction to provide
-                            ordering guarantees.
-                        "bh" option forces use of buffer heads.
-                        "nobh" option tries to avoid associating buffer
-                        heads (supported only for "writeback" mode).
 stripe=n                Number of filesystem blocks that mballoc will try
                        to use for allocation size and alignment. For RAID5/6
                        systems this should be the number of data
@@ -393,8 +385,7 @@ dioread_nolock		locking. If the dioread_nolock option is specified
                        write and convert the extent to initialized after IO
                        completes. This approach allows ext4 code to avoid
                        using inode mutex, which improves scalability on high
-                        speed storages. However this does not work with nobh
+                        speed storages. However this does not work with
-                        option and the mount will fail. Nor does it work with
                        data journaling and dioread_nolock option will be
                        ignored with kernel warning. Note that dioread_nolock
                        code path is only used for extent-based files.
diff --git a/Documentation/filesystems/nfs/nfs41-server.txt b/Documentation/filesystems/nfs/nfs41-server.txt
index 04884914a1c8..092fad92a3f0 100644
--- a/Documentation/filesystems/nfs/nfs41-server.txt
+++ b/Documentation/filesystems/nfs/nfs41-server.txt
@@ -39,27 +39,17 @@ interoperability problems with future clients.  Known issues:
          from a linux client are possible, but we aren't really
          conformant with the spec (for example, we don't use kerberos
          on the backchannel correctly).
-        - no trunking support: no clients currently take advantage of
-          trunking, but this is a mandatory feature, and its use is
-          recommended to clients in a number of places.  (E.g. to ensure
-          timely renewal in case an existing connection's retry timeouts
-          have gotten too long; see section 8.3 of the RFC.)
-          Therefore, lack of this feature may cause future clients to
-          fail.
        - Incomplete backchannel support: incomplete backchannel gss
          support and no support for BACKCHANNEL_CTL mean that
          callbacks (hence delegations and layouts) may not be
          available and clients confused by the incomplete
          implementation may fail.
-        - Server reboot recovery is unsupported; if the server reboots,
-          clients may fail.
        - We do not support SSV, which provides security for shared
          client-server state (thus preventing unauthorized tampering
          with locks and opens, for example).  It is mandatory for
          servers to support this, though no clients use it yet.
        - Mandatory operations which we do not support, such as
-          DESTROY_CLIENTID, FREE_STATEID, SECINFO_NO_NAME, and
+          DESTROY_CLIENTID, are not currently used by clients, but will be
-          TEST_STATEID, are not currently used by clients, but will be
          (and the spec recommends their uses in common cases), and
          clients should not be expected to know how to recover from the
          case where they are not supported.  This will eventually cause
@@ -69,8 +59,9 @@ In addition, some limitations are inherited from the current NFSv4
 implementation:
        - Incomplete delegation enforcement: if a file is renamed or
-          unlinked, a client holding a delegation may continue to
+          unlinked by a local process, a client holding a delegation may
-          indefinitely allow opens of the file under the old name.
+          continue to indefinitely allow opens of the file under the old
+          name.
 The table below, taken from the NFSv4.1 document, lists
 the operations that are mandatory to implement (REQ), optional
@@ -99,7 +90,7 @@ Operations
   +----------------------+------------+--------------+----------------+
   | ACCESS               | REQ        |              | Section 18.1   |
 NS | BACKCHANNEL_CTL      | REQ        |              | Section 18.33  |
-NS | BIND_CONN_TO_SESSION | REQ        |              | Section 18.34  |
+I  | BIND_CONN_TO_SESSION | REQ        |              | Section 18.34  |
   | CLOSE                | REQ        |              | Section 18.2   |
   | COMMIT               | REQ        |              | Section 18.3   |
   | CREATE               | REQ        |              | Section 18.4   |
@@ -111,7 +102,7 @@ NS*| DELEGPURGE           | OPT        | FDELG (REQ)  | Section 18.5   |
 NS | DESTROY_CLIENTID     | REQ        |              | Section 18.50  |
 I  | DESTROY_SESSION      | REQ        |              | Section 18.37  |
 I  | EXCHANGE_ID          | REQ        |              | Section 18.35  |
-NS | FREE_STATEID         | REQ        |              | Section 18.38  |
+I  | FREE_STATEID         | REQ        |              | Section 18.38  |
   | GETATTR              | REQ        |              | Section 18.7   |
 P  | GETDEVICEINFO        | OPT        | pNFS (REQ)   | Section 18.40  |
 P  | GETDEVICELIST        | OPT        | pNFS (OPT)   | Section 18.41  |
@@ -145,14 +136,14 @@ NS*| OPENATTR             | OPT        |              | Section 18.17  |
   | RESTOREFH            | REQ        |              | Section 18.27  |
   | SAVEFH               | REQ        |              | Section 18.28  |
   | SECINFO              | REQ        |              | Section 18.29  |
-NS | SECINFO_NO_NAME      | REC        | pNFS files   | Section 18.45, |
+I  | SECINFO_NO_NAME      | REC        | pNFS files   | Section 18.45, |
   |                      |            | layout (REQ) | Section 13.12  |
 I  | SEQUENCE             | REQ        |              | Section 18.46  |
   | SETATTR              | REQ        |              | Section 18.30  |
   | SETCLIENTID          | MNI        |              | N/A            |
   | SETCLIENTID_CONFIRM  | MNI        |              | N/A            |
 NS | SET_SSV              | REQ        |              | Section 18.47  |
-NS | TEST_STATEID         | REQ        |              | Section 18.48  |
+I  | TEST_STATEID         | REQ        |              | Section 18.48  |
   | VERIFY               | REQ        |              | Section 18.31  |
 NS*| WANT_DELEGATION      | OPT        | FDELG (OPT)  | Section 18.49  |
   | WRITE                | REQ        |              | Section 18.32  |
@@ -206,12 +197,6 @@ CREATE_SESSION:
 SEQUENCE:
 * no support for dynamic slot table renegotiation (optional)
-nfsv4.1 COMPOUND rules:
-The following cases aren't supported yet:
-* Enforcing of NFS4ERR_NOT_ONLY_OP for: BIND_CONN_TO_SESSION, CREATE_SESSION,
-  DESTROY_CLIENTID, DESTROY_SESSION, EXCHANGE_ID.
-* DESTROY_SESSION MUST be the final operation in the COMPOUND request.
 Nonstandard compound limitations:
 * No support for a sessions fore channel RPC compound that requires both a
  ca_maxrequestsize request and a ca_maxresponsesize reply, so we may
@@ -219,3 +204,5 @@ Nonstandard compound limitations:
  negotiation.
 * No more than one IO operation (read, write, readdir) allowed per
  compound.
+See also http://wiki.linux-nfs.org/wiki/index.php/Server_4.0_and_4.1_issues.
diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt
index 90c71c6f0d00..ffdd9d866ad7 100644
--- a/Documentation/filesystems/nfs/nfsroot.txt
+++ b/Documentation/filesystems/nfs/nfsroot.txt
@@ -226,7 +226,7 @@ They depend on various facilities being available:
        cdrecord.
        e.g.
-          cdrecord dev=ATAPI:1,0,0 arch/i386/boot/image.iso
+          cdrecord dev=ATAPI:1,0,0 arch/x86/boot/image.iso
        For more information on isolinux, including how to create bootdisks
        for prebuilt kernels, see http://syslinux.zytor.com/
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index 7f8861d341ea..b4a3d765ff9a 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -407,10 +407,11 @@ to some pointer to returning that pointer.  On errors return ERR_PTR(...).
 --
 [mandatory]
-        ->permission(), generic_permission() and ->check_acl() have lost flags
+        ->permission() and generic_permission()have lost flags
 argument; instead of passing IPERM_FLAG_RCU we add MAY_NOT_BLOCK into mask.
-        generic_permission() has also lost the check_acl argument; if you want
+        generic_permission() has also lost the check_acl argument; ACL checking
-non-NULL to be used for that inode, put it into ->i_op->check_acl.
+has been taken to VFS and filesystems need to provide a non-NULL ->i_op->get_acl
+to read an ACL from disk.
 --
 [mandatory]
diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt
index d4d41465a0b1..7db3ebda5a4c 100644
--- a/Documentation/filesystems/squashfs.txt
+++ b/Documentation/filesystems/squashfs.txt
@@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM
 =======================
 Squashfs is a compressed read-only filesystem for Linux.
-It uses zlib/lzo compression to compress files, inodes and directories.
+It uses zlib/lzo/xz compression to compress files, inodes and directories.
 Inodes in the system are very small and all blocks are packed to minimise
 data overhead. Block sizes greater than 4K are supported up to a maximum
 of 1Mbytes (default block size 128K).
@@ -55,6 +55,8 @@ create populated squashfs filesystems.  This and other squashfs utilities
 can be obtained from http://www.squashfs.org.  Usage instructions can be
 obtained from this site also.
+The squashfs-tools development tree is now located on kernel.org
+        git://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
 3. SQUASHFS FILESYSTEM DESIGN
 -----------------------------
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index eff6617c9a0f..52d8fb81cfff 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -356,7 +356,7 @@ struct inode_operations {
        void (*put_link) (struct dentry *, struct nameidata *, void *);
        void (*truncate) (struct inode *);
        int (*permission) (struct inode *, int);
-        int (*check_acl)(struct inode *, int);
+        int (*get_acl)(struct inode *, int);
        int (*setattr) (struct dentry *, struct iattr *);
        int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
        int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
diff --git a/Documentation/hwmon/it87 b/Documentation/hwmon/it87
index 38425f0f2645..6f496a586732 100644
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
@@ -76,7 +76,8 @@ IT8718F, IT8720F, IT8721F, IT8726F, IT8758E and SiS950 chips.
 These chips are 'Super I/O chips', supporting floppy disks, infrared ports,
 joysticks and other miscellaneous stuff. For hardware monitoring, they
 include an 'environment controller' with 3 temperature sensors, 3 fan
-rotation speed sensors, 8 voltage sensors, and associated alarms.
+rotation speed sensors, 8 voltage sensors, associated alarms, and chassis
+intrusion detection.
 The IT8712F and IT8716F additionally feature VID inputs, used to report
 the Vcore voltage of the processor. The early IT8712F have 5 VID pins,
diff --git a/Documentation/hwmon/lm78 b/Documentation/hwmon/lm78
index 60932e26abaa..2bdc881a0c12 100644
--- a/Documentation/hwmon/lm78
+++ b/Documentation/hwmon/lm78
@@ -13,7 +13,8 @@ Supported chips:
    Datasheet: Publicly available at the National Semiconductor website
               http://www.national.com/
-Author: Frodo Looijaard <frodol@dds.nl>
+Authors: Frodo Looijaard <frodol@dds.nl>
+         Jean Delvare <khali@linux-fr.org>
 Description
 -----------
diff --git a/Documentation/hwmon/sch5636 b/Documentation/hwmon/sch5636
new file mode 100644
index 000000000000..f83bd1c260f0
--- /dev/null
+++ b/Documentation/hwmon/sch5636
@@ -0,0 +1,31 @@
+Kernel driver sch5636
+=====================
+Supported chips:
+  * SMSC SCH5636
+    Prefix: 'sch5636'
+    Addresses scanned: none, address read from Super I/O config space
+Author: Hans de Goede <hdegoede@redhat.com>
+Description
+-----------
+SMSC SCH5636 Super I/O chips include an embedded microcontroller for
+hardware monitoring solutions, allowing motherboard manufacturers to create
+their own custom hwmon solution based upon the SCH5636.
+Currently the sch5636 driver only supports the Fujitsu Theseus SCH5636 based
+hwmon solution. The sch5636 driver runs a sanity check on loading to ensure
+it is dealing with a Fujitsu Theseus and not with another custom SCH5636 based
+hwmon solution.
+The Fujitsu Theseus can monitor up to 5 voltages, 8 fans and 16
+temperatures. Note that the driver detects how many fan headers /
+temperature sensors are actually implemented on the motherboard, so you will
+likely see fewer temperature and fan inputs.
+An application note describing the Theseus' registers, as well as an
+application note describing the protocol for communicating with the
+microcontroller is available upon request. Please mail me if you want a copy.
diff --git a/Documentation/i2o/ioctl b/Documentation/i2o/ioctl
index 1e77fac4e120..22ca53a67e23 100644
--- a/Documentation/i2o/ioctl
+++ b/Documentation/i2o/ioctl
@@ -110,7 +110,7 @@ V. Getting Logical Configuration Table
      ENOBUFS     Buffer not large enough.  If this occurs, the required
                  buffer length is written into *(lct->reslen)
-VI. Settting Parameters
+VI. Setting Parameters
   SYNOPSIS
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 3a46e360496d..72ba8d51dbc1 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -301,6 +301,7 @@ Code  Seq#(hex)	Include File		Comments
                                        <mailto:rusty@rustcorp.com.au>
 0xAE    all     linux/kvm.h             Kernel-based Virtual Machine
                                        <mailto:kvm@vger.kernel.org>
+0xAF    00-1F   linux/fsl_hypervisor.h  Freescale hypervisor
 0xB0    all     RATIO devices           in development:
                                        <mailto:vgo@ratio.de>
 0xB1    00-1F   PPPoX                   <mailto:mostrows@styx.uwaterloo.ca>
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index 99e87a61897d..b1a573cf4472 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -506,7 +506,7 @@ to e.g. the Internet:
     <ISDN subsystem - ISDN support -- HiSax>
     make clean; make zImage; make modules; make modules_install
 2. Install the new kernel
-     cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn
+     cp /usr/src/linux/arch/x86/boot/zImage /etc/kernel/linux.isdn
     vi /etc/lilo.conf
     <add new kernel in the bootable image section>
     lilo
diff --git a/Documentation/ja_JP/SubmittingPatches b/Documentation/ja_JP/SubmittingPatches
index f107c834d242..97f78dd0c085 100644
--- a/Documentation/ja_JP/SubmittingPatches
+++ b/Documentation/ja_JP/SubmittingPatches
@@ -11,16 +11,18 @@ for non English (read: Japanese) speakers and is not intended as a
 fork. So if you have any comments or updates of this file, please try
 to update the original English file first.
-Last Updated: 2007/10/24
+Last Updated: 2011/06/09
 ==================================
 これは、
-linux-2.6.23/Documentation/SubmittingPatches の和訳
+linux-2.6.39/Documentation/SubmittingPatches の和訳
 です。
 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
-翻訳日： 2007/10/17
+翻訳日： 2011/06/09
 翻訳者： Keiichi Kii <k-keiichi at bx dot jp dot nec dot com>
 校正者： Masanari Kobayashi さん <zap03216 at nifty dot ne dot jp>
         Matsukura さん <nbh--mats at nifty dot com>
+         Takeshi Hamasaki さん <hmatrjp at users dot sourceforge dot jp>
 ==================================
        Linux カーネルに変更を加えるための Howto
@@ -97,7 +99,7 @@ Quilt:
 http://savannah.nongnu.org/projects/quilt
 Andrew Morton's patch scripts:
-http://userweb.kernel.org/~akpm/stuff/tpp.txt
+http://userweb.kernel.org/~akpm/stuff/patch-scripts.tar.gz
 このリンクの先のスクリプトの代わりとして、quilt がパッチマネジメント
 ツールとして推奨されています(上のリンクを見てください)。
@@ -109,9 +111,25 @@ http://userweb.kernel.org/~akpm/stuff/tpp.txt
 「ドライバー X に対するバグフィックス」あるいは「このパッチはサブシス
 テム X に対する更新を含んでいます。どうか取り入れてください。」などです。
+パッチの説明を Linux カーネルのソースコードマネジメントシステム「 git 」の
+コミットログとして簡単に引用できる形で書けば、メンテナから感謝されるでしょう。
+以下の #15 を見てください。
 説明が長くなりだしたのであれば、おそらくそれはパッチを分ける必要がある
 という兆候です。次の #3 を見てください。
+パッチ(シリーズ)を(再)投稿する時、十分なパッチの説明とそのパッチが必要な理由を
+パッチに含めてください。ただ「これはパッチ(シリーズ)のバージョン N」とだけ
+書かないでください。そして、パッチをマージする人にパッチの説明を探させそれを
+パッチに追記させるため、過去のバージョンのパッチやそのパッチの URL を参照する
+手間をかけさせないでください。
+つまり、パッチシリーズとその説明は一緒にあるべきです。これはパッチをマージする
+人、レビューする人、どちらのためにもなります。レビューする人の中には、おそらく
+過去のバージョンのパッチを受け取ってもいない人がいます。
+登録済みのバグエントリを修正するパッチであれば、そのバグエントリを示すバグ ID
+や URL を明記してください。
 3) パッチの分割
 意味のあるひとまとまりごとに変更を個々のパッチファイルに分けてください。
@@ -141,7 +159,7 @@ http://userweb.kernel.org/~akpm/stuff/tpp.txt
 拒否されるでしょう。
 あなたはパッチを投稿する前に最低限パッチスタイルチェッカー
-( scripts/patchcheck.pl )を利用してパッチをチェックすべきです。
+( scripts/checkpatch.pl )を利用してパッチをチェックすべきです。
 もしパッチに違反がのこっているならば、それらの全てについてあなたは正当な
 理由を示せるようにしておく必要があります。
@@ -192,13 +210,13 @@ VGER.KERNEL.ORG でホスティングされているメーリングリストの�
 情報がマニュアルページの中に入ってくるように、変更が起きたという
 通知を送ってください。
-たとえ、メンテナが #4 で反応がなかったとしても、メンテナのコードに変更を
+たとえ、メンテナが #5 で反応がなかったとしても、メンテナのコードに変更を
 加えたときには、いつもメンテナに CC するのを忘れないようにしてください。
-小さなパッチであれば、Adrian Bunk ����理している Trivial Patch Monkey
+小さなパッチであれば、Trivial Patch Monkey(ち������と����パッチを集め��いる)
-(ちょっとしたパッチを集めている)<trivial@kernel.org>に CC してもいい
+<trivial@kernel.org>に CC してもいいです。その現管理者については MAINTAINERS
-����。ちょっとしたパッチとは以下のルールのどれか1つを満たしていなけ
+���ァイルを見��������さい���ちょっとしたパッチとは以下のルールのどれか1つを満たして
-ればなりません。
+���なけ���ばなりません。
 ・ドキュメントのスペルミスの修正
 ・grep(1) コマンドによる検索を困難にしているスペルの修正
 ・コンパイル時の警告の修正(無駄な警告が散乱することは好ましくないた
@@ -210,7 +228,6 @@ VGER.KERNEL.ORG でホスティングされているメーリングリストの�
 ・移植性のないコードから移植性のあるコードへの置き換え(小さい範囲で
   あればアーキテクチャ特有のことでも他の人がコピーできます)
 ・作者やメンテナによる修正(すなわち patch monkey の再転送モード)
-EMAIL: <trivial@kernel.org>
 7) MIME やリンクや圧縮ファイルや添付ファイルではなくプレインテキストのみ
@@ -233,26 +250,15 @@ MIME 形式の添付ファイルは Linus に手間を取らせることにな�
 例外：お使いの電子メールクライアントがパッチをめちゃくちゃにするので
 あれば、誰かが MIME 形式のパッチを再送するよう求めるかもしれません。
-警告： Mozilla のような特定の電子メールクライアントは電子メールの
+余計な変更を加えずにあなたのパッチを送信するための電子メールクライアントの設定
-ヘッダに以下のものを付加して送ります。
+のヒントについては Documentation/email-clients.txt を参照してください。
---- message header ----
-Content-Type: text/plain; charset=us-ascii; format=flowed
---- message header ----
-問題は、「 format=flowed 」が付いた電子メールを特定の受信側の電子メール
-クライアントがタブをスペースに置き換えるというような変更をすることです。
-したがって送られてきたパッチは壊れているように見えるでしょう。
-これを修正するには、mozilla の defaults/pref/mailnews.js ファイルを
-以下のように修正します。
-pref("mailnews.send_plaintext_flowed", false); // RFC 2646=======
-pref("mailnews.display.disable_format_flowed_support", true);
 8) 電子メールのサイズ
 パッチを Linus へ送るときは常に #7 の手順に従ってください。
 大きなパッチはメーリングリストやメンテナにとって不親切です。パッチが
-未圧縮で 40KB を超えるようであるなら、インターネット上のアクセス可能な
+未圧縮で 300KB を超えるようであるなら、インターネット上のアクセス可能な
 サーバに保存し、保存場所を示す URL を伝えるほうが適切です。
 9) カーネルバージョンの明記
@@ -324,7 +330,7 @@ Linus や LKML への大量の電子メールのために、サブジェクト�
        (c) 本寄与は(a)、(b)、(c)を証明する第3者から私へ直接提供された
            ものであり、私はそれに変更を加えていない。
-        (d) 私はこのプロジェクトと本寄与が公のものであることに理解及び同意す
+        (d) 私はこのプロジェクトと本寄与が公のものであることに理解及び同意す
            る。同時に、関与した記録(投稿の際の全ての個人情報と sign-off を
            含む)が無期限に保全されることと、当該プロジェクト又は関連する
            オープンソースライセンスに沿った形で再配布されることに理解及び
@@ -340,7 +346,51 @@ Linus や LKML への大量の電子メールのために、サブジェクト�
 無視されますが、あなたはそのタグを社内の手続きに利用したり、sign-off に特別
 な情報を示したりすることができます。
-13) いつ Acked-by: を使うのか
+あなたがサブシステムまたはブランチのメンテナであれば、受け取ったパッチを自身の
+ツリーにマージするために、わずかに変更が必要となる場合があります。なぜなら
+あなたのツリーの中のコードと投稿者のツリーの中のコードは同一ではないためです。
+もし、あなたが厳密に上記ルール(c)にこだわるのであれば、投稿者に再度差分を
+とるよう依頼すべきです。しかし、これは時間とエネルギーを非生産的に浪費する
+ことになります。ルール(b)はあなたにコードを修正する権利を与えてくれます。
+しかし、投稿者のコードを修正し、その修正によるバグを投稿者に押し付けてしまう
+ことはとても失礼なことです。この問題を解決するために、末尾の投稿者の
+Signed-off-by とあなたがその末尾に追加する Signed-off-by の間に、修正を
+加えたことを示す1行を追加することが推奨されています。
+(その1行の書き方に)決まりはありませんが、大括弧の中に電子メールアドレスや氏名
+と修正内容を記載するやり方は目につきやすく、最終段階での変更の責任があなたに
+あることを明確にするのに十分な方法のようです。例えば、
+        Signed-off-by: Random J Developer <random@developer.example.org>
+        [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h]
+        Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org>
+あなたが安定版のブランチを管理しており、作成者のクレジット、変更の追跡、
+修正のマージ、と同時に苦情からの投稿者の保護を行いたい場合、この慣習は特に
+有用となります。いかなる事情があってもチェンジログに出てくる作成者の
+アイデンティティ情報(From ヘッダ)は変更できないことに注意してください。
+バックポートする人のための特別な注意事項。追跡を容易に行うために、コミット
+メッセージのトップ(サブジェクト行のすぐ後)にパッチの起源を示す情報を記述する
+ことは一般的で有用な慣習です。例えば、これは 2.6-stable ツリーでの一例です。    
+    Date:   Tue May 13 19:10:30 2008 +0000
+        SCSI: libiscsi regression in 2.6.25: fix nop timer handling
+        commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream
+そして、これは 2.4 ツリーでの一例です。
+    Date:   Tue May 13 22:12:27 2008 +0200
+        wireless, airo: waitbusy() won't delay
+        [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a]
+どんな形式であれ、この情報はあなたのツリーを追跡する人やあなたのツリーのバグを
+解決しようとしている人にとって価値のある支援となります。
+13) いつ Acked-by: と Cc: を使うのか
 「 Signed-off-by: 」タグはその署名者がパッチの開発に関わっていたことやパッチ
 の伝播パスにいたことを示しています。
@@ -354,7 +404,7 @@ Linus や LKML への大量の電子メールのために、サブジェクト�
 Acked-by: は Signed-off-by: のように公式なタグではありません。それはメンテナが
 少なくともパッチをレビューし、同意を示しているという記録です。そのような
-ことからパッチ��統合者がメンテナの「うん、良いと思うよ」という発言を
+ことからパッチ���マージ������人���メンテナの「うん、良いと思うよ」という発言を
 Acked-by: へ置き換えることがあります。
 Acked-by: が必ずしもパッチ全体の承認を示しているわけではありません。例えば、
@@ -364,7 +414,62 @@ Acked-by: が必ずしもパッチ全体の承認を示しているわけでは�
 この点は、ご自分で判断してください。(その Acked-by: が)疑わしい場合は、
 メーリングリストアーカイブの中の大元の議論を参照すべきです。
-14) 標準的なパッチのフォーマット
+パッチにコメントする機会を持っていたが、その時にコメントしなかった人がいれば、
+その人を指す「Cc:」タグを任意で追加してもかまいません。これは指定された人からの
+明確なアクションなしに付与できる唯一のタグです。
+このタグはパッチに関心があると思われる人達がそのパッチの議論に含まれていたこと
+を明文化します。
+14) Reported-by と Tested-by: と Reviewed-by: の利用
+他の誰かによって報告された問題を修正するパッチであれば、問題報告者という寄与を
+クレジットするために、Reported-by: タグを追加することを検討してください。
+こまめにバグ報告者をクレジットしていくことで、うまくいけばその人たちが将来再び
+コミュニティの力となってくれるでしょう。
+ただし、報告者の許可無くこのタグを追加しないように注意してください。特に、
+問題が公の場で報告されていなかったのであれば。
+Tested-by: タグはタグで指定された人によって(ある環境下で)パッチのテストに成功
+していることを示します。このタグはメンテナにテストが実施済みであることを
+知らせ、将来の関連パッチのテスト協力者を見つける方法を提供し、テスト実施者に
+対するクレジットを保証します。
+Reviewed-by: タグは、それとは異なり、下記のレビューア宣言の下にレビューされ、
+受け入れ可能とみなされたパッチであることを示します。
+        レビューアによる監督宣言
+        私は Reviewed-by: タグを提示することによって、以下のことを明言する。
+        (a) 私はメインラインカーネルへの統合に向け、その妥当性及び「即応性
+            (訳注)」を検証し、技術的側面からパッチをレビュー済みである。
+        訳注:
+        「即応性」の原文は "readiness"。
+        パッチが十分な品質を持っており、メインラインカーネルへの統合を即座に
+        行うことができる状態であるかどうかを "readiness" という単語で表現
+        している。
+        (b) パッチに関するあらゆる問題、懸念、あるいは、疑問は投稿者へ伝達済み
+            である。私はそれらのコメントに対する投稿者の返答に満足している。
+        (c) 投稿に伴い改良されるコードがある一方で、現時点で、私は(1)それが
+            カーネルにとって価値のある変更であること、そして、(2)統合に際して
+            議論になり得るような問題はないものと確信している。
+        (d) 私はパッチをレビューし適切であると確信している一方で、あらゆる
+            状況においてその宣言した目的や機能が正しく実現することに関して、
+            いかなる保証もしない(特にどこかで明示しない限り)。
+Reviewd-by タグはそのパッチがカーネルに対して適切な修正であって、深刻な技術的
+問題を残していないという意見の宣言です。興味のあるレビューアは誰でも(レビュー
+作業を終えたら)パッチに対して Reviewed-by タグを提示できます。このタグは
+レビューアの寄与をクレジットする働き、レビューの進捗の度合いをメンテナに
+知らせる働きを持ちます。そのパッチの領域に詳しく、そして、しっかりとした
+レビューを実施したレビューアによって提供される時、Reviewed-by: タグがあなたの
+パッチをカーネルにマージする可能性を高めるでしょう。
+15) 標準的なパッチのフォーマット
 標準的なパッチのサブジェクトは以下のとおりです。
@@ -396,18 +501,37 @@ Acked-by: が必ずしもパッチ全体の承認を示しているわけでは�
 電子メールのサブジェクト内のサブシステム表記は、パッチが適用される
 分野またはサブシステムを識別できるようにすべきです。
-電子メールのサブジェクトの「概要�����い回し��はそのパッチの概要を正確
+電子メールのサブジェクトの「summary phrase」はそのパッチの概要を正確
-に表現しなければなりません。「概要�����い回し��をファイル名にしてはい
+に表現しなければなりません。「summary phrase」をファイル名にしてはい
-けません。一連������ッチ中でそれぞれのパッチは同じ「概要�����い回し��を
+けません。パッチシリーズ中でそれぞれのパッチは同じ「summary phrase」を
-使ってはいけません(「一連������ッチ」とは順序付けられた関連のある複数の
+使ってはいけません(「パッチ���リーズ���とは順序付けられた関連のある複数の
 パッチ群です)。
-あなたの電子メールの「概要の言い回し」がそのパッチにとって世界で唯
+あなたの電子メールの「summary phrase」がそのパッチにとって世界で唯一の識別子に
-一の識別子になるように心がけてください。「概要の言い回し」は git の
+なるように心がけてください。「summary phrase」は git のチェンジログの中へ
-チェンジログの中へずっと伝播していきます。「概要の言い回し」は、開
+ずっと伝播していきます。「summary phrase」は、開発者が後でパッチを参照する
-発者が後でパッチを参照するために議論の中で利用するかもしれません。
+ために議論の中で利用するかもしれません。
-人々はそのパッチに関連した議論を読むために「概要の言い回し」を使って
+人々はそのパッチに関連した議論を読むために「summary phrase」を使って google で
-google で検索したがるでしょう。
+検索したがるでしょう。それはまた2、3ヶ月あとで、人々が「gitk」や
+「git log --oneline」のようなツールを使用して何千ものパッチに目を通す時、
+唯一目にとまる情報となるでしょう。
+これらの理由のため、「summary phrase」はなぜパッチが必要であるか、パッチが何を
+変更するかの2つの情報をせいぜい70〜75文字で表現していなければなりません。
+「summary phrase」は簡潔であり説明的である表現を目指しつつ、うまく
+まとめられている概要となるべきです。
+「summary phrase」は「Subject: [PATCH tag] <summary phrase>」のように、
+大括弧で閉じられたタグを接頭辞として付加してもかまいません。このタグは
+「summary phrase」の一部とは考えませんが、パッチをどのように取り扱うべきかを
+表現します。
+一般的には「v1, v2, v3」のようなバージョン情報を表すタグ(過去のパッチに対する
+コメントを反映するために複数のバージョンのパッチが投稿されているのであれば)、
+「RFC」のようなコメントを要求するタグが挙げられます。パッチシリーズとして4つの
+パッチがあれば、個々のパッチに「1/4, 2/4, 3/4, 4/4」のように番号を付けても
+かまいません。これは開発者がパッチを適用する順番を確実に把握するためです。
+そして、開発者がパッチシリーズの中のすべてのパッチをもらさずレビュー或いは
+適用するのを保証するためです。
 サブジェクトの例を二つ
@@ -426,7 +550,12 @@ google で検索したがるでしょう。
 説明本体は無期限のソースのチェンジログにコミットされます。なので、説明
 本体はそのパッチに至った議論の詳細を忘れているある程度の技量を持っている人
-がその詳細を思い出すことができるものでなければなりません。
+がその詳細を思い出すことができるものでなければなりません。パッチが対処する
+障害の症状(カーネルログメッセージや oops メッセージ等)を記載することは問題に
+対処可能なパッチを求めてコミットログを検索する人々にとって特に有用です。
+パッチがコンパイル問題を解決するのであれば、そのパッチを探している人が見つける
+ことができる情報だけで十分であり、コンパイル時の全てのエラーを含める必要は
+ありません。「summary phrase」と同様に、簡潔であり説明的であることが重要です。
 「 --- 」マーカー行はパッチ処理ツールに対して、チェンジログメッセージの終端
 部分を認識させるという重要な役目を果たします。
@@ -436,14 +565,46 @@ google で検索したがるでしょう。
 追加され何行消されたかを示すものです。diffstat コマンドは特に大きなパッチに
 おいて役立ちます。その時点でだけ又はメンテナにとってのみ関係のあるコメント
 は無期限に保存されるチェンジログにとって適切ではありません。そのため、この
-ようなコメントもマーカー行の後に書かれるべきです。ファイル名はカーネルソー
+ようなコメントもマーカー行の後に書かれるべきです。
-スツリーのトップディレクトリからの表記でリストされるため、横方向のスペース
+このようなコメントの良い例として、v1 と v2 のバージョン間で何が変更されたかを
-をとり過ぎないように、diffstat コマンドにオプション「  -p 1 -w 70 」を指定し
+表す「パッチの変更履歴」が挙げられます。
-てください(インデントを含めてちょうど80列に合うでしょう)。
+「 --- 」マーカー行の後に diffstat コマンドの結果を含めるのであれば、ファイル
+名はカーネルソースツリーのトップディレクトリからの表記で列記されるため、横方向
+のスペースをとり過ぎないように、diffstat コマンドにオプション「 -p 1 -w 70 」
+を指定してください(インデントを含めてちょうど80列に合うでしょう)。
 適切なパッチのフォーマットの詳細についてはセクション3の参考文献を参照して
 ください。
+16) 「git pull」要求の送り方(Linus の電子メールから)
+間違ったブランチから引っ張るのを防ぐために、git リポジトリのアドレスと
+ブランチ名を同じ行に1行で記載してください。そうすることで、3回の連続クリック
+で全て選択できます。
+正しい形式は下記の通りです。
+        "Please pull from
+                git://jdelvare.pck.nerim.net/jdelvare-2.6 i2c-for-linus
+         to get these changes:"
+その結果、アドレスを自分自身でタイピングして間違えることはなくなります(実際に、
+何度か間違ったブランチから引っ張ってきてしまい、その時に diffstat の結果を
+検証して間違っていることに気づいたことがあります。どこから何を引っ張るべきかを
+「探したり」、正しいブランチ名かどうかを重ねてチェックしたりする必要が
+なくなればより快適になるでしょう)。
+diffstat の結果を生成するために「 git diff -M --stat --summary 」を使って
+ください。-M オプションはファイル名の変更を検知でき、--summary オプションは
+新規ファイル、削除されたファイル、名前が変更されたファイルの概要を生成します。
+-M オプション(ファイル名の変更検知)を指定すると、diffstat の結果はかなり
+異なってきます。git は大規模な変更(追加と削除のペア)をファイル名の変更と
+判断するためです。
 ------------------------------------
 セクション2 - ヒントとTIPSと小技
 ------------------------------------
@@ -459,7 +620,7 @@ google で検索したがるでしょう。
 も逸脱していると、レビューやコメントなしに受け取ってもらえないかもし
 れません。
-唯一の特筆すべき例外は、コードをあるファイルから別のファイルに移動
+特筆すべき例外は、コードをあるファイルから別のファイルに移動
 するときです。この場合、コードを移動するパッチでは、移動されるコード
 に関して移動以外の変更を一切加えるべきではありません。これにより、
 コードの移動とあなたが行ったコードの修正を明確に区別できるようにな
@@ -553,4 +714,11 @@ Kernel Documentation/CodingStyle:
 Linus Torvalds's mail on the canonical patch format:
  <http://lkml.org/lkml/2005/4/7/183>
+Andi Kleen, "On submitting kernel patches"
+  Some strategies to get difficult or controversial changes in.
+  http://halobates.de/on-submitting-patches.pdf
 --
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 47435e56c5da..f47cdefb4d1e 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -441,7 +441,7 @@ more details, with real examples.
        specified if first option are not supported.
        Example:
-                #arch/i386/kernel/Makefile
+                #arch/x86/kernel/Makefile
                vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
        In the above example, vsyscall-flags will be assigned the option
@@ -460,7 +460,7 @@ more details, with real examples.
        supported to use an optional second option.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                cflags-y += $(call cc-option,-march=pentium-mmx,-march=i586)
        In the above example, cflags-y will be assigned the option
@@ -522,7 +522,7 @@ more details, with real examples.
        even though the option was accepted by gcc.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                cflags-y += $(shell \
                if [ $(call cc-version) -ge 0300 ] ; then \
                        echo "-mregparm=3"; fi ;)
@@ -802,7 +802,7 @@ but in the architecture makefiles where the kbuild infrastructure
 is not sufficient this sometimes needs to be explicit.
        Example:
-                #arch/i386/boot/Makefile
+                #arch/x86/boot/Makefile
                subdir- := compressed/
 The above assignment instructs kbuild to descend down in the
@@ -812,12 +812,12 @@ To support the clean infrastructure in the Makefiles that builds the
 final bootimage there is an optional target named archclean:
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                archclean:
-                        $(Q)$(MAKE) $(clean)=arch/i386/boot
+                        $(Q)$(MAKE) $(clean)=arch/x86/boot
-When "make clean" is executed, make will descend down in arch/i386/boot,
+When "make clean" is executed, make will descend down in arch/x86/boot,
-and clean as usual. The Makefile located in arch/i386/boot/ may use
+and clean as usual. The Makefile located in arch/x86/boot/ may use
 the subdir- trick to descend further down.
 Note 1: arch/$(ARCH)/Makefile cannot use "subdir-", because that file is
@@ -882,7 +882,7 @@ When kbuild executes, the following steps are followed (roughly):
        LDFLAGS_vmlinux uses the LDFLAGS_$@ support.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                LDFLAGS_vmlinux := -e stext
    OBJCOPYFLAGS        objcopy flags
@@ -920,14 +920,14 @@ When kbuild executes, the following steps are followed (roughly):
        Often, the KBUILD_CFLAGS variable depends on the configuration.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                cflags-$(CONFIG_M386) += -march=i386
                KBUILD_CFLAGS += $(cflags-y)
        Many arch Makefiles dynamically run the target C compiler to
        probe supported options:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                ...
                cflags-$(CONFIG_MPENTIUMII)     += $(call cc-option,\
@@ -1038,8 +1038,8 @@ When kbuild executes, the following steps are followed (roughly):
        into the arch/$(ARCH)/boot/Makefile.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
-                boot := arch/i386/boot
+                boot := arch/x86/boot
                bzImage: vmlinux
                        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
@@ -1051,7 +1051,7 @@ When kbuild executes, the following steps are followed (roughly):
        To support this, $(archhelp) must be defined.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                define archhelp
                  echo  '* bzImage      - Image (arch/$(ARCH)/boot/bzImage)'
                endif
@@ -1065,7 +1065,7 @@ When kbuild executes, the following steps are followed (roughly):
        from vmlinux.
        Example:
-                #arch/i386/Makefile
+                #arch/x86/Makefile
                all: bzImage
        When "make" is executed without arguments, bzImage will be built.
@@ -1083,7 +1083,7 @@ When kbuild executes, the following steps are followed (roughly):
        2) kbuild knows what files to delete during "make clean"
        Example:
-                #arch/i386/kernel/Makefile
+                #arch/x86/kernel/Makefile
                extra-y := head.o init_task.o
        In this example, extra-y is used to list object files that
@@ -1133,7 +1133,7 @@ When kbuild executes, the following steps are followed (roughly):
        Compress target. Use maximum compression to compress target.
        Example:
-                #arch/i386/boot/Makefile
+                #arch/x86/boot/Makefile
                LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
                LDFLAGS_setup    := -Ttext 0x0 -s --oformat binary -e begtext
@@ -1193,7 +1193,7 @@ When kbuild executes, the following steps are followed (roughly):
        When updating the $(obj)/bzImage target, the line
-        BUILD    arch/i386/boot/bzImage
+        BUILD    arch/x86/boot/bzImage
        will be displayed with "make KBUILD_VERBOSE=0".
@@ -1207,7 +1207,7 @@ When kbuild executes, the following steps are followed (roughly):
        kbuild knows .lds files and includes a rule *lds.S -> *lds.
        Example:
-                #arch/i386/kernel/Makefile
+                #arch/x86/kernel/Makefile
                always := vmlinux.lds
                #Makefile
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 40cc653984ee..4ca93898fbd3 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1846,7 +1846,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        See Documentation/sound/oss/oss-parameters.txt
        panic=          [KNL] Kernel behaviour on panic: delay <timeout>
-                        seconds before rebooting
+                        timeout > 0: seconds before rebooting
+                        timeout = 0: wait forever
+                        timeout < 0: reboot immediately
                        Format: <timeout>
        parkbd.port=    [HW] Parallel port number the keyboard adapter is
@@ -2526,6 +2528,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
                        See also Documentation/input/joystick-parport.txt
+        udbg-immortal   [PPC] When debugging early kernel crashes that
+                        happen after console_init() and before a proper 
+                        console driver takes over, this boot options might
+                        help "seeing" what's going on.
        uhash_entries=  [KNL,NET]
                        Set number of hash buckets for UDP/UDP-Lite connections
@@ -2540,6 +2547,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        unknown_nmi_panic
                        [X86] Cause panic on unknown NMI.
+        usbcore.authorized_default=
+                        [USB] Default USB device authorization:
+                        (default -1 = authorized except for wireless USB,
+                        0 = not authorized, 1 = authorized)
        usbcore.autosuspend=
                        [USB] The autosuspend time delay (in seconds) used
                        for newly-detected USB devices (default 2).  This
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index 4b12abcb2ad3..abf481f780ec 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h
 RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h
 SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h
 HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c
-APM_BIOS_MAGIC        0x4101      apm_user          arch/i386/kernel/apm.c
+APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c
 CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h
 DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c
 DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c
diff --git a/Documentation/mca.txt b/Documentation/mca.txt
index 510375d4209a..dfd130c2207d 100644
--- a/Documentation/mca.txt
+++ b/Documentation/mca.txt
@@ -11,7 +11,7 @@ Adapter Detection
 The ideal MCA adapter detection is done through the use of the
 Programmable Option Select registers.  Generic functions for doing
-this have been added in include/linux/mca.h and arch/i386/kernel/mca.c.
+this have been added in include/linux/mca.h and arch/x86/kernel/mca_32.c.
 Everything needed to detect adapters and read (and write) configuration
 information is there.  A number of MCA-specific drivers already use
 this.  The typical probe code looks like the following:
@@ -81,7 +81,7 @@ more people use shared IRQs on PCI machines.
 In general, an interrupt must be acknowledged not only at the ICU (which
 is done automagically by the kernel), but at the device level.  In
 particular, IRQ 0 must be reset after a timer interrupt (now done in
-arch/i386/kernel/time.c) or the first timer interrupt hangs the system.
+arch/x86/kernel/time.c) or the first timer interrupt hangs the system.
 There were also problems with the 1.3.x floppy drivers, but that seems
 to have been fixed.
diff --git a/Documentation/scheduler/sched-arch.txt b/Documentation/scheduler/sched-arch.txt
index d43dbcbd163b..28aa1075e291 100644
--- a/Documentation/scheduler/sched-arch.txt
+++ b/Documentation/scheduler/sched-arch.txt
@@ -66,7 +66,7 @@ Your cpu_idle routines need to obey the following rules:
            barrier issued (followed by a test of need_resched with
            interrupts disabled, as explained in 3).
-arch/i386/kernel/process.c has examples of both polling and
+arch/x86/kernel/process.c has examples of both polling and
 sleeping idle functions.
diff --git a/Documentation/scsi/BusLogic.txt b/Documentation/scsi/BusLogic.txt
index d7fbc9488b98..48e982cd6fe7 100644
--- a/Documentation/scsi/BusLogic.txt
+++ b/Documentation/scsi/BusLogic.txt
@@ -553,7 +553,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
  make config
  make zImage
-Then install "arch/i386/boot/zImage" as your standard kernel, run lilo if
+Then install "arch/x86/boot/zImage" as your standard kernel, run lilo if
 appropriate, and reboot.
diff --git a/Documentation/serial/computone.txt b/Documentation/serial/computone.txt
index c57ea4781e5d..60a6f657c37d 100644
--- a/Documentation/serial/computone.txt
+++ b/Documentation/serial/computone.txt
@@ -87,7 +87,7 @@ c) Set address on ISA cards then:
           edit /usr/src/linux/drivers/char/ip2.c  
           (Optional - may be specified on kernel command line now)
 d) Run "make zImage" or whatever target you prefer.
-e) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
+e) mv /usr/src/linux/arch/x86/boot/zImage to /boot.
 f) Add new config for this kernel into /etc/lilo.conf, run "lilo"
        or copy to a floppy disk and boot from that floppy disk.
 g) Reboot using this kernel
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 1c7fb0a94e28..704e474a93df 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -61,6 +61,7 @@ show up in /proc/sys/kernel:
 - rtsig-nr
 - sem
 - sg-big-buff                 [ generic SCSI device (sg) ]
+- shm_rmid_forced
 - shmall
 - shmmax                      [ sysv ipc ]
 - shmmni
@@ -518,6 +519,27 @@ kernel.  This value defaults to SHMMAX.
 ==============================================================
+shm_rmid_forced:
+Linux lets you set resource limits, including how much memory one
+process can consume, via setrlimit(2).  Unfortunately, shared memory
+segments are allowed to exist without association with any process, and
+thus might not be counted against any resource limits.  If enabled,
+shared memory segments are automatically destroyed when their attach
+count becomes zero after a detach or a process termination.  It will
+also destroy segments that were created, but never attached to, on exit
+from the process.  The only use left for IPC_RMID is to immediately
+destroy an unattached segment.  Of course, this breaks the way things are
+defined, so some applications might stop working.  Note that this
+feature will do you no good unless you also configure your resource
+limits (in particular, RLIMIT_AS and RLIMIT_NPROC).  Most systems don't
+need this.
+Note that if you change this from 0 to 1, already created segments
+without users and with a dead originative process will be destroyed.
+==============================================================
 softlockup_thresh:
 This value can be used to lower the softlockup tolerance threshold.  The
diff --git a/Documentation/usb/ehci.txt b/Documentation/usb/ehci.txt
index 9dcafa7d930d..160bd6c3ab7b 100644
--- a/Documentation/usb/ehci.txt
+++ b/Documentation/usb/ehci.txt
@@ -210,3 +210,5 @@ TBD:  Interrupt and ISO transfer performance issues.  Those periodic
 transfers are fully scheduled, so the main issue is likely to be how
 to trigger "high bandwidth" modes.
+TBD:  More than standard 80% periodic bandwidth allocation is possible
+through sysfs uframe_periodic_max parameter. Describe that.
diff --git a/Documentation/usb/gadget_hid.txt b/Documentation/usb/gadget_hid.txt
index f4a51f567427..12696c2e43fb 100644
--- a/Documentation/usb/gadget_hid.txt
+++ b/Documentation/usb/gadget_hid.txt
@@ -81,8 +81,8 @@ Send and receive HID reports
        to do this.
        hid_gadget_test is a small interactive program to test the HID
-        gadget driver. To use, point it at a hidg device and set the
+        gadget driver. To use, point it at a hidg device and set the
-        device type (keyboard / mouse / joystick) - E.G.:
+        device type (keyboard / mouse / joystick) - E.G.:
                # hid_gadget_test /dev/hidg0 keyboard
@@ -97,7 +97,7 @@ Send and receive HID reports
        HID gadget.
        Another interesting example is the caps lock test. Type
-        -–caps-lock and hit return. A report is then sent by the
+        --caps-lock and hit return. A report is then sent by the
        gadget and you should receive the host answer, corresponding
        to the caps lock LED status.
diff --git a/Documentation/zh_CN/email-clients.txt b/Documentation/zh_CN/email-clients.txt
index 5d65e323d060..b9a1a3e6c78d 100644
--- a/Documentation/zh_CN/email-clients.txt
+++ b/Documentation/zh_CN/email-clients.txt
@@ -1,4 +1,4 @@
-锘?Chinese translated version of Documentation/email-clients.txt
+Chinese translated version of Documentation/email-clients.txt
 If you have any comment or update to the content, please contact the
 original document maintainer directly.  However, if you have a problem
@@ -8,203 +8,203 @@ or if there is a problem with the translation.
 Chinese maintainer: Harry Wei <harryxiyou@gmail.com>
 ---------------------------------------------------------------------
-Documentation/email-clients.txt ???涓????������??
+Documentation/email-clients.txt ���中���翻译
-濡??????���??璁���????存?��???????????������??璇��?存?ヨ??��诲?????�����??缁存?よ?????���????��?������?���?���??
+���果���评论���更新本文���内��，请������联��������档的维���������如果你使�����文
-浜ゆ???????���?��??���?锛?���????���ュ??涓???????缁���?��??���???┿??���???????������????���?颁???????���?????���?
+交�����困难的话���也���以向中文���������者���������������本���译���新不���时���者���
-璇?瀛???ㄩ??棰?��?������??��������??????缁存?��?????
+译存在���题，请�����中�������护������
-���???????���存?��??锛? ������??濞?  Harry Wei <harryxiyou@gmail.com>
+中������������者： 贾威威  Harry Wei <harryxiyou@gmail.com>
-���???????���昏?????锛? ���惧??���?  Harry Wei <harryxiyou@gmail.com>
+中��������译者： 贾威威  Harry Wei <harryxiyou@gmail.com>
-���?????????¤?????锛? Yinglin Luan <synmyth@gmail.com>
+中���版校译者： Yinglin Luan <synmyth@gmail.com>
                Xiaochen Wang <wangxiaochen0@gmail.com>
                yaxinsn <yaxinsn@163.com>
-���ヤ??���烘?ｆ??
+以下为������
 ---------------------------------------------------------------------
-Linux???���跺?���?���?????���?���℃??
+Linux邮件客��端������信���
 ======================================================================
-?????????���?
+普通配���
 ----------------------------------------------------------------------
-Linux?????歌ˉ涓???????杩????浠惰?????浜ょ??锛????濂芥??琛ヤ??浣?涓洪??浠朵????????宓?????????????浜?缁存?よ??
+Linux内核补丁是通过邮件被提交的，最好把补丁作为邮件体的内嵌文本。有些维护者
-??ユ?堕??������??���???????�����?????瀹���?煎??���?璇ユ??"text/plain"?????惰??���????�����????????涓?���???????锛?
+���收附件，但是附件的内��������应������"text/plain"。然而，���件一般���不���������，
-???涓���??��?浣���ˉ涓????寮???ㄩ?��????���??������??���?涓???????���???伴?俱??
+因���������使���丁��引������分在评论������中���的很��难。
-??ㄦ?ュ?????Linux?????歌ˉ涓???????浠跺?㈡?风????ㄥ?????琛ヤ????跺??璇ュ??浜?????????????濮???舵?????渚?濡?锛?
+用来发送Linux内核补丁的邮件客户端在发送补丁时应该处于文本的原始状态。例如，
-���?���?���???���?���?????????????ゅ?���������???????�����?硷???????���????ㄦ??���?琛????���?澶���?????��?���俱??
+他们不能���变���者��除�����������������格��������������每一行������头或者���尾。
-涓?瑕????杩?"format=flowed"������????????琛���?????���???���??��?璧���?????���????������?????���崇?????琛????
+不要通过"format=flowed"模���发���补丁���这���会引���不���预���以及���害的���行��
-涓?瑕?��╀????????浠���?㈡?风??��?���??????���?���?????���???���??���???���??浣????������?????
+不�����你���邮件客���端进行自动��������这���也���破���你���补丁���
-???浠跺?㈡?风??涓???芥?瑰???????????瀛?绗????缂??????瑰?????瑕??????????琛ヤ???????芥??ASCII??????UTF-8缂??????瑰??锛?
+邮件客户端不能改变文本的字符集编码方式。要发送的补丁只能是ASCII或者UTF-8编码方式，
-��????浣?浣��??UTF-8��??????���???????????��讹????ｄ??浣?���?���???���??���?浜??????��????????���?��???????棰????
+如���你����UTF-8��码���������送����，那么你将会避免一些可���发生的�����������题。
-???浠跺?㈡?���??���?���ュ���???骞���??���???? References: ?????? In-Reply-To: ???���?���???���??
+���件客������应���形���并且保��� References: 或者 In-Reply-To: ���������那么
-???浠惰??棰?灏��??��?���???????
+邮件话��就不���中���。
-澶???剁??甯?(?????????璐寸??甯?)???甯镐????界?ㄤ??琛ヤ??锛????涓哄?惰〃绗?浼?杞????涓虹┖??笺??浣跨??xclipboard, xclip
+复制粘帖(或者剪贴粘帖)通常不能用于补丁，因为制表符会转换为空格。使用xclipboard, xclip
-??????xcutsel涔?璁稿??浠ワ??浣???????濂���??璇?���?���?????????���??�����?ㄥ????��??��????
+或者xcutsel也���可��，但��������������一下或者���免使��复制粘帖。
-涓?瑕???ㄤ娇???PGP/GPG缃插????????浠朵腑??????琛ヤ?????杩???蜂??浣垮??寰?澶???????涓???借?诲??????????ㄤ??浣????琛ヤ?????
+不要在使用PGP/GPG署名的邮件中包含补丁。这样会使得很多脚本不能读取和适用于你的补丁。
-��?���?涓????棰?搴?璇ユ?????浠��慨澶????锛?
+（这个���题��该���可以修���的）
-??ㄧ???????搁??浠跺??琛ㄥ?????琛ヤ??涔????锛?缁????宸卞?????涓?涓?琛ヤ?????涓?涓???????涓绘??锛?淇?瀛???ユ?跺?扮??
+在给内核邮件列表发送补丁之前，给自己发送一个补丁是个不错的主意，保存接收到的
-???浠���??���?���ヤ?????'patch'??戒��???���?锛?���??????????��?锛????缁??????��??������??琛���????????
+��件，将补�����'patch'命�����上，如������功了，再给内��邮件列���发送���
-���?���????浠跺?���?风?????���?
+一些邮��客�����提示
 ----------------------------------------------------------------------
-杩????缁???轰??浜?璇?缁????MUA???缃????绀猴?????浠ョ?ㄤ??缁?Linux?????稿?????琛ヤ?????杩?浜?骞朵???????虫??
+这里给出一些详细的MUA配置提示，可以用于给Linux内核发送补丁。这些并不意味是
-?????????���?���跺?????���???��?????
+������������件包��置总结。
-璇��??锛?
+说���：
-TUI = ���ユ?????������?虹???????ㄦ?���?��??
+TUI = 以������为���础�����户��口
-GUI = ??惧舰?????��?ㄦ?��?��??
+GUI = 图��界������户��口
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Alpine (TUI)
-???��????椤癸??
+配���选项���
-???"Sending Preferences"??ㄥ??���?
+在"Sending Preferences"���分：
- "Do Not Send Flowed Text"蹇?椤���?????
+- "Do Not Send Flowed Text"必须开��
- "Strip Whitespace Before Sending"蹇?椤诲?抽??
+- "Strip Whitespace Before Sending"必须关闭
-褰???????������?讹????????���?��ユ?惧?���ˉ���?浼???��?扮????��?��????跺?????涓?CTRL-R���???????��?������??���????
+当写邮件���，光���应������在补丁会���现��地���，���后�����CTRL-R���合��，使��定���
-琛ヤ?????浠���????��?���??��朵���???
+���������件������到邮件中。
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Evolution (GUI)
-涓?浜?���????????????????浣���?���????????������??
+一些���发���成功��使�����发送补丁
-褰??????╅??浠���??���癸??Preformat
+���选���邮件选项：Preformat
-  浠?Format->Heading->Preformatted (Ctrl-7)??????�����?锋??
+  从Format->Heading->Preformatted (Ctrl-7)或者���具栏
-??跺??浣跨??���?
+然后使���：
-  Insert->Text File... (Alt-n x)?????ヨˉ���????浠���??
+  Insert->Text File... (Alt-n x)���入���丁文件。
-浣?杩????��?"diff -Nru old.c new.c | xclip"���???????Preformat锛???跺??浣跨?ㄤ腑??撮??杩?��?���?���????
+��还可以"diff -Nru old.c new.c | xclip"，���择Preformat，������使���中间��进行���帖。
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Kmail (GUI)
-���?浜?���????????????????浣���?��????????琛���?????
+一些开发者������的使用���发送���丁���
-榛?���よ?剧疆涓?涓?HTML??煎??????????????���?涓?���??????���?????
+默认设���不为HTML格式是合���的��不要启���它���
-褰?涔????涓?灏????浠剁????跺??锛???ㄩ??椤逛?????涓?瑕??????╄????ㄦ?㈣????????涓????缂虹?瑰氨???浣???ㄩ??浠朵腑杈???ョ??浠讳????????
+当书写一封邮件的时候，在选项下面不要选择自动换行。唯一的缺点就是你在邮件中输入的任何文本
-??戒??浼?琚??????ㄦ?㈣??锛????姝や??蹇?椤诲?ㄥ?????琛ヤ??涔?????????ㄦ?㈣????????绠?????????规??灏辨???????ㄨ????ㄦ?㈣????ヤ功??????浠讹??
+都不会被自动换行，因此你必须在发送补丁之前手动换行。最简单的方法就是启用自动换行来书写邮件，
-??跺?????瀹?淇?瀛?涓鸿??绋裤??涓????浣???ㄨ??绋夸腑???娆℃??寮?瀹?锛?瀹?宸茬????ㄩ?ㄨ????ㄦ?㈣??浜?锛???ｄ??浣???????浠惰?界?舵病???
+然后把它保存为草稿。一旦你在草稿中再次打开它，它已经全部自动换行了，那么你的邮件虽然没有
-?????╄????ㄦ?㈣??���?���????��?���?���?�����?�����???????????���?㈣?????
+������自动���行，但���还不���失去已���的自�����������
-??���??浠���??搴????���??????���ˉ���?���????锛???���??��哥?ㄧ??���ヤ??���????���?锛?涓?涓?杩?瀛????(---)???
+在邮件�����部，���入补丁之前，��上��������补丁定������：三个连��号(---)。
-??跺?????"Message"????????＄??锛??????╂????ユ??浠讹????ョ????????浣????琛ヤ?????浠躲??杩????涓?涓?棰?澶???????椤癸??浣????浠?
+然后在"Message"菜单条目，选择插入文件，接着选取你的补丁文件。还有一个额外的选项，你可以
-???杩?���????缃?浣???????浠���缓绔?�����?���????????锛?杩????��ュ������?"insert file"??���?????
+������它���置�����邮件建���工具���菜单，还可以带上"insert file"图标��
-浣????浠ュ????ㄥ?伴??杩?GPG???璁伴??浠讹??浣???????宓?琛ヤ?????濂戒??瑕?浣跨??GPG???璁板??浠????浣?涓哄??宓??????????绛惧??琛ヤ??锛?
+你可以安全地通过GPG标记附件，但是内嵌补丁最好不要使用GPG标记它们。作为内嵌文本的签发补丁，
-褰?浠?GPG���???????7浣?��??????���??浣���??���?????????��??澶???????
+当从GPG中���取7位��码���会使他们���的�����复��。
-濡????浣????瑕?浠ラ??浠剁??褰㈠????????琛ヤ??锛???ｄ??灏卞?抽????瑰?婚??浠讹????跺?????涓?灞???э??绐????"Suggest automatic
+如果你非要以附件的形式发送补丁，那么就右键点击附件，然后选中属性，突出"Suggest automatic
-display"锛?���???���??���????���舵?村?��??璁╄?��???????��??
+display"，这����������件���容������读者看���。
-褰?浣?瑕?淇?瀛?灏?瑕?????????????宓???????琛ヤ??锛?浣????浠ヤ??娑???????琛ㄧ????奸????╁?????琛ヤ????????浠讹????跺????冲?婚?????
+当你要保存将要发送的内嵌文本补丁，你可以从消息列表窗格选择包含补丁的邮件，然后右击选择
-"save as"???浣????浠ヤ娇??ㄤ??涓?娌℃????存?圭????????琛ヤ????????浠讹??濡????瀹????浠ユ?ｇ‘???褰㈠??缁???????褰?浣?姝ｇ????ㄥ??
+"save as"。你可以使用一个没有更改的包含补丁的邮件，如果它是以正确的形式组成。当你正真在它
-???宸辩??绐???ｄ??涓?瀵????锛???ｆ?舵病??????椤瑰??浠ヤ??瀛????浠?--宸茬?????涓?涓?杩???风??bug琚?姹???ュ?颁??kmail???bugzilla
+自己的窗口之下察看，那时没有选项可以保存邮件--已经有一个这样的bug被汇报到了kmail的bugzilla
-骞朵??甯????杩?灏?浼?琚?澶??????????浠舵??浠ュ?????瀵规??涓???ㄦ?峰??璇诲???????????琚?淇?瀛????锛????浠ュ?????浣???虫?????浠跺????跺?板?朵????版?癸??
+并且希望这将会被处理。邮件是以只针对某个用户可读写的权限被保存的，所以如果你想把邮件复制到其他地方，
-浣?涓?���?���????���?浠????????????���负���?????????翠?????璇���??
+你不���不���他们的������改为������者整体可读。
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Lotus Notes (GUI)
-涓?瑕?浣���?���?????
+不���使��它���
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Mutt (TUI)
-���?���?Linux���????浜���??浣��??mutt瀹㈡?风??锛????���ヨ?????��????瀹?�����????????�����??��????
+��多Linux������人员使��mutt客������，��以证明它�����工��的非常漂亮。
-Mutt涓????甯?缂?杈????锛????浠ヤ??绠′??浣跨?ㄤ??涔?缂?杈???ㄩ?戒??搴?璇ュ甫????????ㄦ??琛????澶у????扮??杈???ㄩ?藉甫???
+Mutt不自带编辑器，所以不管你使用什么编辑器都不应该带有自动断行。大多数编辑器都带有
-涓?涓?"insert file"???椤癸??���????浠���??���?��???���?????���跺??�����????瑰???????ユ??���躲??
+一个"insert file"�����，��可以通过不���变�����内容������������入文件。
-'vim'浣?涓?mutt???��?杈????锛?
+'vim'作为mutt������辑器：
  set editor="vi"
-  ��????浣��??xclip锛???���?ヤ���涓???戒��
+  如�������xclip，���入���下命��
  :set paste
-  ???���????��??????????shift-insert??????������??
+  ���中���之前或者shift-insert������使��
  :r filename
-濡??????���?????琛ヤ??���?������??���??????????
+���������要把补丁作为������文本。
-(a)ttach���ヤ?????���?���斤??涓?甯????"set paste"???
+(a)ttach���作的很好，���������"set paste"。
-???��????椤癸??
+配���选项���
-瀹?搴?璇���互榛?璁よ?���疆???��㈠??������?????
+��������以默�����置的形式工作���
-??���??锛????"send_charset"���剧疆涓?"us-ascii::utf-8"���????涓?涓?涓???????涓��?????
+然而，���"send_charset"设���为"us-ascii::utf-8"也���一个不��������意。
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Pine (TUI)
-Pine杩???���??���?��?�����?���????????��?锛?浣????杩?��???板?��??璇���?��??淇?澶?浜????
+Pine过����一些���格删减问题��但���这些现���应�����被修���了���
-���???????浠ワ??璇�����???alpine(pine???�����?���??)
+如������以，请使��alpine(pine���继承���)
-???��????椤癸??
+配���选项���
- ???���?????????????���?娑???ゆ??���???????
+- ��������版本需要消除流��文本
- "no-strip-whitespace-before-send"???�����????????���???????
+- "no-strip-whitespace-before-send"选项也������要���。
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Sylpheed (GUI)
- ???���??????????���ュ??������??���ヤ??锛???????������?���??浠讹?????
+- ���������本可以很好������作（������使����件）。
- ???��镐��??���????ㄧ??��?杈???���??
+- ��许使用���������辑器���
- �����?????��?���?��???���??甯告?????
+- 对于��录���������非���慢。
- ��???????杩?non-SSL���???ワ?????娉?�����??TLS SMTP?????????
+- 如���通���non-SSL连���，���法使��TLS SMTP授权。
- ??ㄧ?????��???��腑???���?���?���??????���??ruler bar???
+- 在组���窗口中���一个���有用��ruler bar。
- ���???���?????���?娣诲????���??灏���??浼?���ｇ���???���?�����?�����??????
+- ���地������中������������就不会������的�����显示名���
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Thunderbird (GUI)
-榛?璁ゆ????典??锛?thunderbird寰?瀹规??????????????锛?浣????杩????涓?浜???规?????浠ュ己??跺?????寰???村ソ???
+默认情况下，thunderbird很容易损坏文本，但是还有一些方法可以强制它变得更好。
- ??ㄧ?ㄦ?���????���?������???���?���???????�����??���?���?瑕???????"Compose messages in HTML format"???
+- ������户���号设������������成和寻��，不���������"Compose messages in HTML format"。
- ��?杈?浣????Thunderbird???���?������疆??���娇瀹?���?瑕????琛?浣���??���?user_pref("mailnews.wraplength", 0);
+- ��辑你的Thunderbird配���设���来使���不要������使���：user_pref("mailnews.wraplength", 0);
- ��?杈?浣????Thunderbird???缃?��剧������?浣垮??涓?瑕?浣��??"format=flowed"??煎??锛?user_pref("mailnews.
+- ��辑你的Thunderbird配���设置���使��不��使用"format=flowed"格式：user_pref("mailnews.
  send_plaintext_flowed", false);
- 浣????瑕?浣?Thunderbird???������???????煎????瑰??锛?
+- 你需要使Thunderbird变为预先���式���式：
-  濡????榛?璁ゆ????典??浣?涔??????????HTML??煎??锛???ｄ?????寰???俱??浠?浠?浠????棰???????涓????妗?涓???????"Preformat"??煎?????
+  如果默认情况下你书写的是HTML格式，那不是很难。仅仅从标题栏的下拉框中选择"Preformat"格式。
-  濡????榛?璁ゆ????典??浣?涔??????????????????煎??锛?浣?涓?寰????瀹???逛负HTML??煎??锛?浠?浠?浣?涓轰??娆℃?х??锛???ヤ功?????扮??娑????锛?
+  如果默认情况下你书写的是文本格式，你不得把它改为HTML格式（仅仅作为一次性的）来书写新的消息，
-  ??跺??寮哄?朵娇瀹??????版???????煎??锛???????瀹?灏变?????琛????瑕?瀹???板??锛???ㄥ??淇＄????炬??涓?浣跨??shift?????ヤ娇瀹????涓?HTML
+  然后强制使它回到文本格式，否则它就会拆行。要实现它，在写信的图标上使用shift键来使它变为HTML
-  ??���??���???跺?????���???????���????妗?���???????"Preformat"??煎?????
+  格式，�����标������的下������中选择"Preformat"格式。
- ???��镐��??���????ㄧ??��?杈????锛?
+- ��许使用���������辑器：
-  ???瀵?Thunderbird???琛ヤ?????绠?????????规??灏辨??浣跨?ㄤ??涓?"external editor"??╁??锛???跺??浣跨?ㄤ????????娆㈢??
+  针对Thunderbird打补丁最简单的方法就是使用一个"external editor"扩展，然后使用你最喜欢的
-  $EDITOR??ヨ?诲???????????骞惰ˉ涓???版?????涓????瑕?瀹???板??锛????浠ヤ??杞藉苟涓?瀹?瑁?杩?涓???╁??锛???跺??娣诲??涓?涓?浣跨?ㄥ?????
+  $EDITOR来读取或者合并补丁到文本中。要实现它，可以下载并且安装这个扩展，然后添加一个使用它的
-  ??????View->Toolbars->Customize...??????褰?���?���????淇���???????跺??���?浠???���?诲??灏���??浠���?????
+  按键View->Toolbars->Customize...���后当你书写信��������候仅仅���击它������以了���
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 TkRat (GUI)
-???浠ヤ��??���?????浣��??"Insert file..."??????���???���??��?杈???���??
+���以使��它���使��"Insert file..."���者外部����辑器���
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Gmail (Web GUI)
-涓?��?浣���?��????????琛���?????
+不要使���它��送���丁���
-Gmail���?椤���?��?风???????ㄥ?版????���〃���?���????������┖??笺??
+Gmail�����客������自动地����������转换��空格。
-??界?跺?惰〃绗?杞????涓虹┖??奸??棰????浠ヨ??澶???ㄧ??杈???ㄨВ??筹???????跺??杩?浼?浣跨?ㄥ??杞???㈣?????姣?琛???????涓?78涓?瀛?绗????
+虽然制表符转换为空格问题可以被外部编辑器解决，同时它还会使用回车换行把每行拆分为78个字符。
-???涓?涓????棰????Gmail杩?浼????浠讳??涓????ASCII???瀛?绗????淇℃????逛负base64缂???????瀹????涓?瑗垮????????娆ф床浜虹?????瀛????
+另一个问题是Gmail还会把任何不是ASCII的字符的信息改为base64编码。它把东西变的像欧洲人的名字。
                                ###
diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index 4c4ce853577b..c278f412dc65 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC    0x04bf      mkiss_channel     drivers/net/mkiss.h
 RISCOM8_MAGIC         0x0907      riscom_port       drivers/char/riscom8.h
 SPECIALIX_MAGIC       0x0907      specialix_port    drivers/char/specialix_io8.h
 HDLC_MAGIC            0x239e      n_hdlc            drivers/char/n_hdlc.c
-APM_BIOS_MAGIC        0x4101      apm_user          arch/i386/kernel/apm.c
+APM_BIOS_MAGIC        0x4101      apm_user          arch/x86/kernel/apm_32.c
 CYCLADES_MAGIC        0x4359      cyclades_port     include/linux/cyclades.h
 DB_MAGIC              0x4442      fc_info           drivers/net/iph5526_novram.c
 DL_MAGIC              0x444d      fc_info           drivers/net/iph5526_novram.c
author	Arnd Bergmann <arnd@arndb.de>	2011-07-28 11:25:46 -0400
committer	Arnd Bergmann <arnd@arndb.de>	2011-07-28 11:25:46 -0400
commit	6124a4e430b64d1577438c8648c59e996d02e73e (patch)
tree	49cfafad785d1c9e403a5b0d755298b9af2c260f /Documentation
parent	8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff)
parent	580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff)