diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 22:11:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 22:11:50 -0500 |
| commit | 3aacd625f20129f5a41ea3ff3b5353b0e4dabd01 (patch) | |
| tree | 7cf4ea65397f80098b30494df31cfc8f5fa26d63 /Documentation | |
| parent | 7e21774db5cc9cf8fe93a64a2f0c6cf47db8ab24 (diff) | |
| parent | 2a1d689c9ba42a6066540fb221b6ecbd6298b728 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge second patch-bomb from Andrew Morton:
- various misc bits
- the rest of MM
- add generic fixmap.h, use it
- backlight updates
- dynamic_debug updates
- printk() updates
- checkpatch updates
- binfmt_elf
- ramfs
- init/
- autofs4
- drivers/rtc
- nilfs
- hfsplus
- Documentation/
- coredump
- procfs
- fork
- exec
- kexec
- kdump
- partitions
- rapidio
- rbtree
- userns
- memstick
- w1
- decompressors
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (197 commits)
lib/decompress_unlz4.c: always set an error return code on failures
romfs: fix returm err while getting inode in fill_super
drivers/w1/masters/w1-gpio.c: add strong pullup emulation
drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
userns: relax the posix_acl_valid() checks
arch/sh/kernel/dwarf.c: use rbtree postorder iteration helper instead of solution using repeated rb_erase()
fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix
fs/ext3: use rbtree postorder iteration helper instead of opencoding
fs/jffs2: use rbtree postorder iteration helper instead of opencoding
fs/ext4: use rbtree postorder iteration helper instead of opencoding
fs/ubifs: use rbtree postorder iteration helper instead of opencoding
net/netfilter/ipset/ip_set_hash_netiface.c: use rbtree postorder iteration instead of opencoding
rbtree/test: test rbtree_postorder_for_each_entry_safe()
rbtree/test: move rb_node to the middle of the test struct
rapidio: add modular rapidio core build into powerpc and mips branches
partitions/efi: complete documentation of gpt kernel param purpose
kdump: add /sys/kernel/vmcoreinfo ABI documentation
kdump: fix exported size of vmcoreinfo note
kexec: add sysctl to disable kexec_load
fs/exec.c: call arch_pick_mmap_layout() only once
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-kernel-vmcoreinfo | 14 | ||||
| -rw-r--r-- | Documentation/blockdev/ramdisk.txt | 21 | ||||
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt | 27 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/maxim,ds1742.txt | 12 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 | ||||
| -rw-r--r-- | Documentation/dynamic-debug-howto.txt | 9 | ||||
| -rw-r--r-- | Documentation/filesystems/00-INDEX | 58 | ||||
| -rw-r--r-- | Documentation/filesystems/nilfs2.txt | 56 | ||||
| -rw-r--r-- | Documentation/filesystems/sysfs.txt | 6 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 11 | ||||
| -rw-r--r-- | Documentation/printk-formats.txt | 11 | ||||
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 15 | ||||
| -rw-r--r-- | Documentation/trace/postprocess/trace-vmscan-postprocess.pl | 18 | ||||
| -rw-r--r-- | Documentation/vm/locking | 130 |
15 files changed, 225 insertions, 166 deletions
diff --git a/Documentation/ABI/testing/sysfs-kernel-vmcoreinfo b/Documentation/ABI/testing/sysfs-kernel-vmcoreinfo new file mode 100644 index 000000000000..7bd81168e063 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-kernel-vmcoreinfo | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | What: /sys/kernel/vmcoreinfo | ||
| 2 | Date: October 2007 | ||
| 3 | KernelVersion: 2.6.24 | ||
| 4 | Contact: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> | ||
| 5 | Kexec Mailing List <kexec@lists.infradead.org> | ||
| 6 | Vivek Goyal <vgoyal@redhat.com> | ||
| 7 | Description | ||
| 8 | Shows physical address and size of vmcoreinfo ELF note. | ||
| 9 | First value contains physical address of note in hex and | ||
| 10 | second value contains the size of note in hex. This ELF | ||
| 11 | note info is parsed by second kernel and exported to user | ||
| 12 | space as part of ELF note in /proc/vmcore file. This note | ||
| 13 | contains various information like struct size, symbol | ||
| 14 | values, page size etc. | ||
diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/blockdev/ramdisk.txt index fa72e97dd669..fe2ef978d85a 100644 --- a/Documentation/blockdev/ramdisk.txt +++ b/Documentation/blockdev/ramdisk.txt | |||
| @@ -36,21 +36,30 @@ allowing one to squeeze more programs onto an average installation or | |||
| 36 | rescue floppy disk. | 36 | rescue floppy disk. |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | 2) Kernel Command Line Parameters | 39 | 2) Parameters |
| 40 | --------------------------------- | 40 | --------------------------------- |
| 41 | 41 | ||
| 42 | 2a) Kernel Command Line Parameters | ||
| 43 | |||
| 42 | ramdisk_size=N | 44 | ramdisk_size=N |
| 43 | ============== | 45 | ============== |
| 44 | 46 | ||
| 45 | This parameter tells the RAM disk driver to set up RAM disks of N k size. The | 47 | This parameter tells the RAM disk driver to set up RAM disks of N k size. The |
| 46 | default is 4096 (4 MB) (8192 (8 MB) on S390). | 48 | default is 4096 (4 MB). |
| 49 | |||
| 50 | 2b) Module parameters | ||
| 47 | 51 | ||
| 48 | ramdisk_blocksize=N | 52 | rd_nr |
| 49 | =================== | 53 | ===== |
| 54 | /dev/ramX devices created. | ||
| 50 | 55 | ||
| 51 | This parameter tells the RAM disk driver how many bytes to use per block. The | 56 | max_part |
| 52 | default is 1024 (BLOCK_SIZE). | 57 | ======== |
| 58 | Maximum partition number. | ||
| 53 | 59 | ||
| 60 | rd_size | ||
| 61 | ======= | ||
| 62 | See ramdisk_size. | ||
| 54 | 63 | ||
| 55 | 3) Using "rdev -r" | 64 | 3) Using "rdev -r" |
| 56 | ------------------ | 65 | ------------------ |
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt index 8cb9938cc47e..be675d2d15a7 100644 --- a/Documentation/cpu-hotplug.txt +++ b/Documentation/cpu-hotplug.txt | |||
| @@ -285,7 +285,7 @@ A: This is what you would need in your kernel code to receive notifications. | |||
| 285 | return NOTIFY_OK; | 285 | return NOTIFY_OK; |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | static struct notifier_block foobar_cpu_notifer = | 288 | static struct notifier_block foobar_cpu_notifier = |
| 289 | { | 289 | { |
| 290 | .notifier_call = foobar_cpu_callback, | 290 | .notifier_call = foobar_cpu_callback, |
| 291 | }; | 291 | }; |
diff --git a/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt b/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt new file mode 100644 index 000000000000..31406fd4a43e --- /dev/null +++ b/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | Haoyu Microelectronics HYM8563 Real Time Clock | ||
| 2 | |||
| 3 | The HYM8563 provides basic rtc and alarm functionality | ||
| 4 | as well as a clock output of up to 32kHz. | ||
| 5 | |||
| 6 | Required properties: | ||
| 7 | - compatible: should be: "haoyu,hym8563" | ||
| 8 | - reg: i2c address | ||
| 9 | - interrupts: rtc alarm/event interrupt | ||
| 10 | - #clock-cells: the value should be 0 | ||
| 11 | |||
| 12 | Example: | ||
| 13 | |||
| 14 | hym8563: hym8563@51 { | ||
| 15 | compatible = "haoyu,hym8563"; | ||
| 16 | reg = <0x51>; | ||
| 17 | |||
| 18 | interrupts = <13 IRQ_TYPE_EDGE_FALLING>; | ||
| 19 | |||
| 20 | #clock-cells = <0>; | ||
| 21 | }; | ||
| 22 | |||
| 23 | device { | ||
| 24 | ... | ||
| 25 | clocks = <&hym8563>; | ||
| 26 | ... | ||
| 27 | }; | ||
diff --git a/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt b/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt new file mode 100644 index 000000000000..d0f937c355b5 --- /dev/null +++ b/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | * Maxim (Dallas) DS1742/DS1743 Real Time Clock | ||
| 2 | |||
| 3 | Required properties: | ||
| 4 | - compatible: Should contain "maxim,ds1742". | ||
| 5 | - reg: Physical base address of the RTC and length of memory | ||
| 6 | mapped region. | ||
| 7 | |||
| 8 | Example: | ||
| 9 | rtc: rtc@10000000 { | ||
| 10 | compatible = "maxim,ds1742"; | ||
| 11 | reg = <0x10000000 0x800>; | ||
| 12 | }; | ||
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index ff415d183352..520596da7953 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
| @@ -34,6 +34,7 @@ fsl Freescale Semiconductor | |||
| 34 | GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 34 | GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. |
| 35 | gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 35 | gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. |
| 36 | gmt Global Mixed-mode Technology, Inc. | 36 | gmt Global Mixed-mode Technology, Inc. |
| 37 | haoyu Haoyu Microelectronic Co. Ltd. | ||
| 37 | hisilicon Hisilicon Limited. | 38 | hisilicon Hisilicon Limited. |
| 38 | hp Hewlett Packard | 39 | hp Hewlett Packard |
| 39 | ibm International Business Machines (IBM) | 40 | ibm International Business Machines (IBM) |
diff --git a/Documentation/dynamic-debug-howto.txt b/Documentation/dynamic-debug-howto.txt index 1bbdcfcf1f13..46325eb2ea76 100644 --- a/Documentation/dynamic-debug-howto.txt +++ b/Documentation/dynamic-debug-howto.txt | |||
| @@ -108,6 +108,12 @@ If your query set is big, you can batch them too: | |||
| 108 | 108 | ||
| 109 | ~# cat query-batch-file > <debugfs>/dynamic_debug/control | 109 | ~# cat query-batch-file > <debugfs>/dynamic_debug/control |
| 110 | 110 | ||
| 111 | A another way is to use wildcard. The match rule support '*' (matches | ||
| 112 | zero or more characters) and '?' (matches exactly one character).For | ||
| 113 | example, you can match all usb drivers: | ||
| 114 | |||
| 115 | ~# echo "file drivers/usb/* +p" > <debugfs>/dynamic_debug/control | ||
| 116 | |||
| 111 | At the syntactical level, a command comprises a sequence of match | 117 | At the syntactical level, a command comprises a sequence of match |
| 112 | specifications, followed by a flags change specification. | 118 | specifications, followed by a flags change specification. |
| 113 | 119 | ||
| @@ -315,6 +321,9 @@ nullarbor:~ # echo -n 'func svc_process -p' > | |||
| 315 | nullarbor:~ # echo -n 'format "nfsd: READ" +p' > | 321 | nullarbor:~ # echo -n 'format "nfsd: READ" +p' > |
| 316 | <debugfs>/dynamic_debug/control | 322 | <debugfs>/dynamic_debug/control |
| 317 | 323 | ||
| 324 | // enable messages in files of which the pathes include string "usb" | ||
