Merge branch 'akpm' (incoming from Andrew)

3aacd625 · Linus Torvalds <[email protected]> · 2014-01-23 19:11:50 -08:00

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 <[email protected]>: (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
  ...

Commit: 3aacd625f20129f5a41ea3ff3b5353b0e4dabd01
Parents: 7e21774d · 2a1d689c

Merge commit. Changes below are compared with the first parent: 7e21774d.

Changes

231 files changed · +3339 −2187

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-kernel-vmcoreinfo	added	+14	−0	View file
Documentation/blockdev/ramdisk.txt	modified	+15	−6	View file
Documentation/cpu-hotplug.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt	added	+27	−0	View file
Documentation/devicetree/bindings/rtc/maxim,ds1742.txt	added	+12	−0	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+1	−0	View file
Documentation/dynamic-debug-howto.txt	modified	+9	−0	View file
Documentation/filesystems/00-INDEX	modified	+45	−13	View file
Documentation/filesystems/nilfs2.txt	modified	+56	−0	View file
Documentation/filesystems/sysfs.txt	modified	+3	−3	View file
Documentation/kernel-parameters.txt	modified	+10	−1	View file
Documentation/printk-formats.txt	modified	+9	−2	View file
Documentation/sysctl/kernel.txt	modified	+14	−1	View file
Documentation/trace/postprocess/trace-vmscan-postprocess.pl	modified	+9	−9	View file
Documentation/vm/locking	deleted	+0	−130	View before deletion
MAINTAINERS	modified	+11	−1	View file
arch/alpha/Kconfig	modified	+4	−4	View file
arch/arc/Kconfig	modified	+2	−2	View file
arch/arm/Kconfig	modified	+6	−6	View file
arch/cris/include/asm/io.h	modified	+4	−0	View file
arch/hexagon/include/asm/fixmap.h	modified	+1	−39	View file
arch/ia64/Kconfig	modified	+1	−0	View file
arch/ia64/include/asm/dmi.h	modified	+5	−3	View file
arch/ia64/include/asm/processor.h	modified	+1	−0	View file
arch/m32r/Kconfig	modified	+4	−4	View file
arch/metag/include/asm/fixmap.h	modified	+1	−31	View file
arch/microblaze/Kconfig	modified	+1	−0	View file
arch/microblaze/include/asm/fixmap.h	modified	+2	−42	View file
arch/mips/Kconfig	modified	+5	−5	View file
arch/mips/include/asm/fixmap.h	modified	+1	−32	View file
arch/mn10300/Kconfig	modified	+4	−4	View file
arch/parisc/Kconfig	modified	+4	−4	View file
arch/powerpc/Kconfig	modified	+2	−2	View file
arch/powerpc/include/asm/fixmap.h	modified	+2	−42	View file
arch/s390/Kconfig	modified	+2	−2	View file
arch/sh/Kconfig	modified	+4	−4	View file
arch/sh/include/asm/fixmap.h	modified	+2	−37	View file
arch/sh/kernel/dwarf.c	modified	+4	−14	View file
arch/sparc/Kconfig	modified	+2	−2	View file
arch/tile/include/asm/fixmap.h	modified	+1	−32	View file
arch/um/include/asm/fixmap.h	modified	+1	−39	View file
arch/x86/Kconfig	modified	+5	−4	View file
arch/x86/include/asm/dmi.h	modified	+4	−2	View file
arch/x86/include/asm/fixmap.h	modified	+1	−58	View file
arch/x86/mm/gup.c	modified	+4	−4	View file
drivers/block/Kconfig	modified	+2	−1	View file
drivers/firmware/Kconfig	modified	+3	−0	View file
drivers/firmware/dmi_scan.c	modified	+10	−10	View file
drivers/gpu/drm/gma500/backlight.c	modified	+2	−2	View file
drivers/mailbox/omap-mbox.h	modified	+1	−1	View file
drivers/memstick/host/rtsx_pci_ms.c	modified	+20	−10	View file
drivers/mfd/max8998.c	modified	+1	−1	View file
drivers/mfd/tps65217.c	modified	+1	−1	View file
drivers/rtc/Kconfig	modified	+12	−1	View file
drivers/rtc/Makefile	modified	+1	−0	View file
drivers/rtc/class.c	modified	+20	−4	View file
drivers/rtc/rtc-as3722.c	modified	+3	−16	View file
drivers/rtc/rtc-cmos.c	modified	+3	−5	View file
drivers/rtc/rtc-ds1305.c	modified	+0	−1	View file
drivers/rtc/rtc-ds1742.c	modified	+9	−1	View file
drivers/rtc/rtc-hym8563.c	added	+606	−0	View file
drivers/rtc/rtc-max8907.c	modified	+5	−6	View file
drivers/rtc/rtc-mxc.c	modified	+5	−5	View file
drivers/rtc/rtc-pcf2127.c	modified	+1	−4	View file
drivers/rtc/rtc-rx8581.c	modified	+68	−13	View file
drivers/rtc/rtc-s5m.c	modified	+2	−0	View file
drivers/rtc/rtc-twl.c	modified	+13	−25	View file
drivers/rtc/rtc-vr41xx.c	modified	+12	−38	View file
drivers/video/aty/aty128fb.c	modified	+4	−0	View file
drivers/video/backlight/hp680_bl.c	modified	+2	−4	View file
drivers/video/backlight/jornada720_bl.c	modified	+3	−12	View file
drivers/video/backlight/jornada720_lcd.c	modified	+2	−11	View file
drivers/video/backlight/kb3886_bl.c	modified	+1	−1	View file
drivers/video/backlight/l4f00242t03.c	modified	+2	−4	View file
drivers/video/backlight/lp855x_bl.c	modified	+1	−1	View file
drivers/video/backlight/lp8788_bl.c	modified	+3	−3	View file
drivers/video/backlight/omap1_bl.c	modified	+2	−12	View file
drivers/video/backlight/ot200_bl.c	modified	+3	−6	View file
drivers/video/backlight/tosa_bl.c	modified	+3	−4	View file
drivers/video/backlight/tosa_lcd.c	modified	+2	−4	View file
drivers/vlynq/vlynq.c	modified	+2	−1	View file
drivers/w1/masters/w1-gpio.c	modified	+22	−0	View file
drivers/w1/w1_int.c	modified	+0	−12	View file
fs/autofs4/autofs_i.h	modified	+2	−2	View file
fs/autofs4/dev-ioctl.c	modified	+14	−2	View file
fs/autofs4/expire.c	modified	+14	−0	View file
fs/autofs4/inode.c	modified	+35	−14	View file
fs/autofs4/root.c	modified	+3	−3	View file
fs/autofs4/symlink.c	modified	+4	−0	View file
fs/autofs4/waitq.c	modified	+14	−2	View file
fs/binfmt_elf.c	modified	+0	−3	View file
fs/coredump.c	modified	+0	−1	View file
fs/coredump.h	deleted	+0	−6	View before deletion
fs/exec.c	modified	+25	−95	View file
fs/ext3/dir.c	modified	+9	−35	View file
fs/ext4/block_validity.c	modified	+4	−29	View file
fs/ext4/dir.c	modified	+5	−30	View file
fs/hfsplus/inode.c	modified	+0	−59	View file
fs/jffs2/nodelist.c	modified	+2	−26	View file
fs/jffs2/readinode.c	modified	+3	−23	View file
fs/logfs/segment.c	modified	+2	−1	View file
fs/nilfs2/ioctl.c	modified	+370	−1	View file
fs/pipe.c	modified	+2	−1	View file
fs/posix_acl.c	modified	+0	−10	View file
fs/proc/array.c	modified	+4	−14	View file
fs/proc/base.c	modified	+36	−33	View file
fs/proc/cmdline.c	modified	+1	−1	View file
fs/proc/consoles.c	modified	+1	−1	View file
fs/proc/cpuinfo.c	modified	+1	−1	View file
fs/proc/devices.c	modified	+1	−1	View file
fs/proc/generic.c	modified	+1	−2	View file
fs/proc/interrupts.c	modified	+1	−1	View file
fs/proc/kcore.c	modified	+1	−1	View file
fs/proc/kmsg.c	modified	+1	−1	View file
fs/proc/loadavg.c	modified	+1	−1	View file
fs/proc/meminfo.c	modified	+1	−1	View file
fs/proc/nommu.c	modified	+1	−1	View file
fs/proc/page.c	modified	+6	−4	View file
fs/proc/proc_devtree.c	modified	+3	−2	View file
fs/proc/softirqs.c	modified	+1	−1	View file
fs/proc/stat.c	modified	+1	−1	View file
fs/proc/uptime.c	modified	+1	−1	View file
fs/proc/version.c	modified	+1	−1	View file
fs/proc/vmcore.c	modified	+1	−1	View file
fs/proc_namespace.c	modified	+1	−6	View file
fs/ramfs/file-mmu.c	modified	+0	−7	View file
fs/ramfs/file-nommu.c	modified	+8	−9	View file
fs/ramfs/inode.c	modified	+7	−0	View file
fs/ramfs/internal.h	modified	+0	−1	View file
fs/reiserfs/reiserfs.h	modified	+0	−2	View file
fs/romfs/super.c	modified	+2	−4	View file
fs/ubifs/debug.c	modified	+3	−19	View file
fs/ubifs/log.c	modified	+2	−19	View file
fs/ubifs/orphan.c	modified	+2	−19	View file
fs/ubifs/recovery.c	modified	+3	−18	View file
fs/ubifs/super.c	modified	+4	−20	View file
fs/ubifs/tnc.c	modified	+3	−19	View file
include/asm-generic/fixmap.h	added	+97	−0	View file
include/asm-generic/int-l64.h	deleted	+0	−49	View before deletion
include/linux/cache.h	modified	+2	−2	View file
include/linux/ceph/decode.h	modified	+0	−17	View file
include/linux/genalloc.h	modified	+2	−0	View file
include/linux/gfp.h	modified	+1	−0	View file
include/linux/hugetlb.h	modified	+2	−1	View file
include/linux/hugetlb_cgroup.h	modified	+3	−2	View file
include/linux/kernel.h	modified	+13	−0	View file
include/linux/kexec.h	modified	+1	−0	View file
include/linux/memblock.h	modified	+1	−0	View file
include/linux/memcontrol.h	modified	+13	−10	View file
include/linux/mm.h	modified	+13	−14	View file
include/linux/mmdebug.h	modified	+9	−0	View file
include/linux/of.h	modified	+6	−1	View file
include/linux/page-flags.h	modified	+5	−5	View file
include/linux/pagemap.h	modified	+5	−5	View file
include/linux/parser.h	modified	+1	−0	View file
include/linux/percpu.h	modified	+1	−0	View file
include/linux/printk.h	modified	+10	−9	View file
include/linux/ramfs.h	modified	+0	−7	View file
include/linux/sched.h	modified	+19	−11	View file
include/linux/sched/sysctl.h	modified	+4	−0	View file
include/linux/slab.h	modified	+7	−2	View file
include/linux/w1-gpio.h	modified	+1	−0	View file
include/uapi/asm-generic/types.h	modified	+1	−2	View file
include/uapi/linux/dn.h	modified	+1	−0	View file
include/uapi/linux/nfs4.h	modified	+1	−1	View file
include/uapi/linux/perf_event.h	modified	+1	−1	View file
include/uapi/linux/ppp-ioctl.h	modified	+1	−0	View file
init/initramfs.c	modified	+1	−1	View file
init/main.c	modified	+4	−7	View file
kernel/fork.c	modified	+3	−7	View file
kernel/kexec.c	modified	+2	−1	View file
kernel/ksysfs.c	modified	+1	−1	View file
kernel/printk/printk.c	modified	+6	−3	View file
kernel/sched/core.c	modified	+23	−1	View file
kernel/signal.c	modified	+3	−4	View file
kernel/sys.c	modified	+3	−5	View file
kernel/sysctl.c	modified	+22	−0	View file
lib/Kconfig.debug	modified	+27	−0	View file
lib/Makefile	modified	+2	−0	View file
lib/cmdline.c	modified	+6	−8	View file
lib/decompress_unlz4.c	modified	+1	−0	View file
lib/dynamic_debug.c	modified	+10	−5	View file
lib/kstrtox.c	modified	+0	−1	View file
lib/parser.c	modified	+56	−6	View file
lib/rbtree_test.c	modified	+12	−1	View file
lib/test_module.c	added	+33	−0	View file
lib/test_user_copy.c	added	+110	−0	View file
lib/vsprintf.c	modified	+27	−6	View file
mm/balloon_compaction.c	modified	+2	−2	View file
mm/cleancache.c	modified	+3	−3	View file
mm/compaction.c	modified	+5	−2	View file
mm/filemap.c	modified	+8	−8	View file
mm/huge_memory.c	modified	+26	−20	View file
mm/hugetlb.c	modified	+5	−5	View file
mm/hugetlb_cgroup.c	modified	+1	−1	View file
mm/internal.h	modified	+11	−8	View file
mm/ksm.c	modified	+7	−7	View file
mm/memblock.c	modified	+16	−13	View file
mm/memcontrol.c	modified	+254	−270	View file
mm/memory-failure.c	modified	+11	−10	View file
mm/memory.c	modified	+5	−5	View file
mm/memory_hotplug.c	modified	+5	−4	View file
mm/mempolicy.c	modified	+3	−5	View file
mm/migrate.c	modified	+3	−5	View file
mm/mincore.c	modified	+0	−7	View file
mm/mlock.c	modified	+62	−46	View file
mm/mm_init.c	modified	+1	−2	View file
mm/mmap.c	modified	+13	−5	View file
mm/mmu_notifier.c	modified	+1	−2	View file
mm/nobootmem.c	modified	+19	−6	View file
mm/oom_kill.c	modified	+8	−4	View file
mm/page_alloc.c	modified	+72	−30	View file
mm/page_io.c	modified	+2	−2	View file
mm/rmap.c	modified	+7	−7	View file
mm/shmem.c	modified	+4	−4	View file
mm/slab.h	modified	+25	−1	View file
mm/slab_common.c	modified	+54	−36	View file
mm/slub.c	modified	+6	−6	View file
mm/swap.c	modified	+18	−18	View file
mm/swap_state.c	modified	+8	−8	View file
mm/swapfile.c	modified	+6	−5	View file
mm/vmscan.c	modified	+41	−23	View file
mm/zswap.c	modified	+2	−2	View file
net/ipv4/tcp_illinois.c	modified	+0	−1	View file
net/netfilter/ipset/ip_set_hash_netiface.c	modified	+4	−23	View file
scripts/checkpatch.pl	modified	+163	−17	View file
scripts/get_maintainer.pl	modified	+85	−6	View file
scripts/headers_check.pl	modified	+5	−1	View file
scripts/sortextable.c	modified	+5	−0	View file
tools/testing/selftests/Makefile	modified	+1	−0	View file
tools/testing/selftests/user/Makefile	added	+13	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-kernel-vmcoreinfo

View file

diff --git a/Documentation/ABI/testing/sysfs-kernel-vmcoreinfo b/Documentation/ABI/testing/sysfs-kernel-vmcoreinfo
new file mode 100644
index 0000000..7bd8116
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-kernel-vmcoreinfo
@@ -0,0 +1,14 @@
+What:		/sys/kernel/vmcoreinfo
+Date:		October 2007
+KernelVersion:	2.6.24
+Contact:	Ken'ichi Ohmichi <[email protected]>
+		Kexec Mailing List <[email protected]>
+		Vivek Goyal <[email protected]>
+Description
+		Shows physical address and size of vmcoreinfo ELF note.
+		First value contains physical address of note in hex and
+		second value contains the size of note in hex. This ELF
+		note info is parsed by second kernel and exported to user
+		space as part of ELF note in /proc/vmcore file. This note
+		contains various information like struct size, symbol
+		values, page size etc.

Documentation/blockdev/ramdisk.txt

View file

diff --git a/Documentation/blockdev/ramdisk.txt b/Documentation/blockdev/ramdisk.txt
index fa72e97..fe2ef97 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
 rescue floppy disk.
 
 
-2) Kernel Command Line Parameters
+2) Parameters
 ---------------------------------
 
+2a) Kernel Command Line Parameters
+
 	ramdisk_size=N
 	==============
 
 This parameter tells the RAM disk driver to set up RAM disks of N k size.  The
-default is 4096 (4 MB) (8192 (8 MB) on S390).
+default is 4096 (4 MB).
+
+2b) Module parameters
 
-	ramdisk_blocksize=N
-	===================
+	rd_nr
+	=====
+	/dev/ramX devices created.
 
-This parameter tells the RAM disk driver how many bytes to use per block.  The
-default is 1024 (BLOCK_SIZE).
+	max_part
+	========
+	Maximum partition number.
 
+	rd_size
+	=======
+	See ramdisk_size.
 
 3) Using "rdev -r"
 ------------------

Documentation/cpu-hotplug.txt

View file

diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index 8cb9938..be675d2 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.
 		return NOTIFY_OK;
 	}
 
-	static struct notifier_block foobar_cpu_notifer =
+	static struct notifier_block foobar_cpu_notifier =
 	{
 	   .notifier_call = foobar_cpu_callback,
 	};

Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt

View file

diff --git a/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt b/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt
new file mode 100644
index 0000000..31406fd
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt
@@ -0,0 +1,27 @@
+Haoyu Microelectronics HYM8563 Real Time Clock
+
+The HYM8563 provides basic rtc and alarm functionality
+as well as a clock output of up to 32kHz.
+
+Required properties:
+- compatible: should be: "haoyu,hym8563"
+- reg: i2c address
+- interrupts: rtc alarm/event interrupt
+- #clock-cells: the value should be 0
+
+Example:
+
+hym8563: hym8563@51 {
+	compatible = "haoyu,hym8563";
+	reg = <0x51>;
+
+	interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
+
+	#clock-cells = <0>;
+};
+
+device {
+...
+	clocks = <&hym8563>;
+...
+};

Documentation/devicetree/bindings/rtc/maxim,ds1742.txt

View file

diff --git a/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt b/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt
new file mode 100644
index 0000000..d0f937c
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/maxim,ds1742.txt
@@ -0,0 +1,12 @@
+* Maxim (Dallas) DS1742/DS1743 Real Time Clock
+
+Required properties:
+- compatible: Should contain "maxim,ds1742".
+- reg: Physical base address of the RTC and length of memory
+  mapped region.
+
+Example:
+	rtc: rtc@10000000 {
+		compatible = "maxim,ds1742";
+		reg = <0x10000000 0x800>;
+	};

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index ff415d1..520596d 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -34,6 +34,7 @@ fsl	Freescale Semiconductor
 GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gmt	Global Mixed-mode Technology, Inc.
+haoyu	Haoyu Microelectronic Co. Ltd.
 hisilicon	Hisilicon Limited.
 hp	Hewlett Packard
 ibm	International Business Machines (IBM)

Documentation/dynamic-debug-howto.txt

View file

diff --git a/Documentation/dynamic-debug-howto.txt b/Documentation/dynamic-debug-howto.txt
index 1bbdcfc..46325eb 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:
 
   ~# cat query-batch-file > <debugfs>/dynamic_debug/control
 
+A another way is to use wildcard. The match rule support '*' (matches
+zero or more characters) and '?' (matches exactly one character).For
+example, you can match all usb drivers:
+
+  ~# echo "file drivers/usb/* +p" > <debugfs>/dynamic_debug/control
+
 At the syntactical level, a command comprises a sequence of match
 specifications, followed by a flags change specification.
 
@@ -315,6 +321,9 @@ nullarbor:~ # echo -n 'func svc_process -p' >
 nullarbor:~ # echo -n 'format "nfsd: READ" +p' >
 				<debugfs>/dynamic_debug/control
 
+// enable messages in files of which the pathes include string "usb"
+nullarbor:~ # echo -n '*usb* +p' > <debugfs>/dynamic_debug/control
+
 // enable all messages
 nullarbor:~ # echo -n '+p' > <debugfs>/dynamic_debug/control
 

Documentation/filesystems/00-INDEX

View file

diff --git a/Documentation/filesystems/00-INDEX b/Documentation/filesystems/00-INDEX
index 8042050..632211c 100644
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
@@ -10,24 +10,32 @@ afs.txt
 	- info and examples for the distributed AFS (Andrew File System) fs.
 affs.txt
 	- info and mount options for the Amiga Fast File System.
+autofs4-mount-control.txt
+	- info on device control operations for autofs4 module.
 automount-support.txt
 	- information about filesystem automount support.
 befs.txt
 	- information about the BeOS filesystem for Linux.
 bfs.txt
 	- info for the SCO UnixWare Boot Filesystem (BFS).
+btrfs.txt
+	- info for the BTRFS filesystem.
+caching/
+	- directory containing filesystem cache documentation.
 ceph.txt
-	- info for the Ceph Distributed File System
-cifs.txt
-	- description of the CIFS filesystem.
+	- info for the Ceph Distributed File System.
+cifs/
+	- directory containing CIFS filesystem documentation and example code.
 coda.txt
 	- description of the CODA filesystem.
 configfs/
 	- directory containing configfs documentation and example code.
 cramfs.txt
 	- info on the cram filesystem for small storage (ROMs etc).
-dentry-locking.txt
-	- info on the RCU-based dcache locking model.
+debugfs.txt
+	- info on the debugfs filesystem.
+devpts.txt
+	- info on the devpts filesystem.
 directory-locking
 	- info about the locking scheme used for directory operations.
 dlmfs.txt
@@ -35,7 +43,7 @@ dlmfs.txt
 dnotify.txt
 	- info about directory notification in Linux.
 dnotify_test.c
-	- example program for dnotify
+	- example program for dnotify.
 ecryptfs.txt
 	- docs on eCryptfs: stacked cryptographic filesystem for Linux.
 efivarfs.txt
@@ -48,12 +56,18 @@ ext3.txt
 	- info, mount options and specifications for the Ext3 filesystem.
 ext4.txt
 	- info, mount options and specifications for the Ext4 filesystem.
-files.txt
-	- info on file management in the Linux kernel.
 f2fs.txt
 	- info and mount options for the F2FS filesystem.
+fiemap.txt
+	- info on fiemap ioctl.
+files.txt
+	- info on file management in the Linux kernel.
 fuse.txt
 	- info on the Filesystem in User SpacE including mount options.
+gfs2-glocks.txt
+	- info on the Global File System 2 - Glock internal locking rules.
+gfs2-uevents.txt
+	- info on the Global File System 2 - uevents.
 gfs2.txt
 	- info on the Global File System 2.
 hfs.txt
@@ -84,40 +98,58 @@ ntfs.txt
 	- info and mount options for the NTFS filesystem (Windows NT).
 ocfs2.txt
 	- info and mount options for the OCFS2 clustered filesystem.
+omfs.txt
+	- info on the Optimized MPEG FileSystem.
+path-lookup.txt
+	- info on path walking and name lookup locking.
+pohmelfs/
+	- directory containing pohmelfs filesystem documentation.
 porting
 	- various information on filesystem porting.
 proc.txt
 	- info on Linux's /proc filesystem.
+qnx6.txt
+	- info on the QNX6 filesystem.
+quota.txt
+	- info on Quota subsystem.
 ramfs-rootfs-initramfs.txt
 	- info on the 'in memory' filesystems ramfs, rootfs and initramfs.
-reiser4.txt
-	- info on the Reiser4 filesystem based on dancing tree algorithms.
 relay.txt
 	- info on relay, for efficient streaming from kernel to user space.
 romfs.txt
 	- description of the ROMFS filesystem.
 seq_file.txt
-	- how to use the seq_file API
+	- how to use the seq_file API.
 sharedsubtree.txt
 	- a description of shared subtrees for namespaces.
 spufs.txt
 	- info and mount options for the SPU filesystem used on Cell.
+squashfs.txt
+	- info on the squashfs filesystem.
 sysfs-pci.txt
 	- info on accessing PCI device resources through sysfs.
+sysfs-tagging.txt
+	- info on sysfs tagging to avoid duplicates.
 sysfs.txt
 	- info on sysfs, a ram-based filesystem for exporting kernel objects.
 sysv-fs.txt
 	- info on the SystemV/V7/Xenix/Coherent filesystem.
 tmpfs.txt
 	- info on tmpfs, a filesystem that holds all files in virtual memory.
+ubifs.txt
+	- info on the Unsorted Block Images FileSystem.
 udf.txt
 	- info and mount options for the UDF filesystem.
 ufs.txt
 	- info on the ufs filesystem.
 vfat.txt
-	- info on using the VFAT filesystem used in Windows NT and Windows 95
+	- info on using the VFAT filesystem used in Windows NT and Windows 95.
 vfs.txt
-	- overview of the Virtual File System
+	- overview of the Virtual File System.
+xfs-delayed-logging-design.txt
+	- info on the XFS Delayed Logging Design.
+xfs-self-describing-metadata.txt
+	- info on XFS Self Describing Metadata.
 xfs.txt
 	- info and mount options for the XFS filesystem.
 xip.txt

Documentation/filesystems/nilfs2.txt

View file

diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index 873a2ab..06887d4 100644
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -81,6 +81,62 @@ nodiscard(*)		The discard/TRIM commands are sent to the underlying
 			block device when blocks are freed.  This is useful
 			for SSD devices and sparse/thinly-provisioned LUNs.
 
+Ioctls
+======
+
+There is some NILFS2 specific functionality which can be accessed by applications
+through the system call interfaces. The list of all NILFS2 specific ioctls are
+shown in the table below.
+
+Table of NILFS2 specific ioctls
+..............................................................................
+ Ioctl			        Description
+ NILFS_IOCTL_CHANGE_CPMODE      Change mode of given checkpoint between
+			        checkpoint and snapshot state. This ioctl is
+			        used in chcp and mkcp utilities.
+
+ NILFS_IOCTL_DELETE_CHECKPOINT  Remove checkpoint from NILFS2 file system.
+			        This ioctl is used in rmcp utility.
+
+ NILFS_IOCTL_GET_CPINFO         Return info about requested checkpoints. This
+			        ioctl is used in lscp utility and by
+			        nilfs_cleanerd daemon.
+
+ NILFS_IOCTL_GET_CPSTAT         Return checkpoints statistics. This ioctl is
+			        used by lscp, rmcp utilities and by
+			        nilfs_cleanerd daemon.
+
+ NILFS_IOCTL_GET_SUINFO         Return segment usage info about requested
+			        segments. This ioctl is used in lssu,
+			        nilfs_resize utilities and by nilfs_cleanerd
+			        daemon.
+
+ NILFS_IOCTL_GET_SUSTAT         Return segment usage statistics. This ioctl
+			        is used in lssu, nilfs_resize utilities and
+			        by nilfs_cleanerd daemon.
+
+ NILFS_IOCTL_GET_VINFO          Return information on virtual block addresses.
+			        This ioctl is used by nilfs_cleanerd daemon.
+
+ NILFS_IOCTL_GET_BDESCS         Return information about descriptors of disk
+			        block numbers. This ioctl is used by
+			        nilfs_cleanerd daemon.
+
+ NILFS_IOCTL_CLEAN_SEGMENTS     Do garbage collection operation in the
+			        environment of requested parameters from
+			        userspace. This ioctl is used by
+			        nilfs_cleanerd daemon.
+
+ NILFS_IOCTL_SYNC               Make a checkpoint. This ioctl is used in
+			        mkcp utility.
+
+ NILFS_IOCTL_RESIZE             Resize NILFS2 volume. This ioctl is used
+			        by nilfs_resize utility.
+
+ NILFS_IOCTL_SET_ALLOC_RANGE    Define lower limit of segments in bytes and
+			        upper limit of segments in bytes. This ioctl
+			        is used by nilfs_resize utility.
+
 NILFS2 usage
 ============
 

Documentation/filesystems/sysfs.txt

View file

diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index a6619b7..b35a64b 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -108,12 +108,12 @@ static DEVICE_ATTR(foo, S_IWUSR | S_IRUGO, show_foo, store_foo);
 is equivalent to doing:
 
 static struct device_attribute dev_attr_foo = {
-       .attr	= {
+	.attr = {
 		.name = "foo",
 		.mode = S_IWUSR | S_IRUGO,
-		.show = show_foo,
-		.store = store_foo,
 	},
+	.show = show_foo,
+	.store = store_foo,
 };
 
 

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d4762d7..4473856 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1059,7 +1059,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			debugfs files are removed at module unload time.
 
 	gpt		[EFI] Forces disk with valid GPT signature but
-			invalid Protective MBR to be treated as GPT.
+			invalid Protective MBR to be treated as GPT. If the
+			primary GPT is corrupted, it enables the backup/alternate
+			GPT to be used instead.
 
 	grcan.enable0=	[HW] Configuration of physical interface 0. Determines
 			the "Enable 0" bit of the configuration register.
@@ -1461,6 +1463,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			Valid arguments: on, off
 			Default: on
 
+	kmemcheck=	[X86] Boot-time kmemcheck enable/disable/one-shot mode
+			Valid arguments: 0, 1, 2
+			kmemcheck=0 (disabled)
+			kmemcheck=1 (enabled)
+			kmemcheck=2 (one-shot mode)
+			Default: 2 (one-shot mode)
+
 	kstack=N	[X86] Print N words from the kernel stack
 			in oops dumps.
 

Documentation/printk-formats.txt

View file

diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 445ad74..6f4eb32 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -55,14 +55,21 @@ Struct Resources:
 	For printing struct resources. The 'R' and 'r' specifiers result in a
 	printed resource with ('R') or without ('r') a decoded flags member.
 
-Physical addresses:
+Physical addresses types phys_addr_t:
 
-	%pa	0x01234567 or 0x0123456789abcdef
+	%pa[p]	0x01234567 or 0x0123456789abcdef
 
 	For printing a phys_addr_t type (and its derivatives, such as
 	resource_size_t) which can vary based on build options, regardless of
 	the width of the CPU data path. Passed by reference.
 
+DMA addresses types dma_addr_t:
+
+	%pad	0x01234567 or 0x0123456789abcdef
+
+	For printing a dma_addr_t type which can vary based on build options,
+	regardless of the width of the CPU data path. Passed by reference.
+
 Raw buffer as a hex string:
 	%*ph	00 01 02  ...  3f
 	%*phC	00:01:02: ... :3f

Documentation/sysctl/kernel.txt

View file

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 6d48640..ee9a2f9 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -33,6 +33,7 @@ show up in /proc/sys/kernel:
 - domainname
 - hostname
 - hotplug
+- kexec_load_disabled
 - kptr_restrict
 - kstack_depth_to_print       [ X86 only ]
 - l2cr                        [ PPC only ]
@@ -287,6 +288,18 @@ Default value is "/sbin/hotplug".
 
 ==============================================================
 
+kexec_load_disabled:
+
+A toggle indicating if the kexec_load syscall has been disabled. This
+value defaults to 0 (false: kexec_load enabled), but can be set to 1
+(true: kexec_load disabled). Once true, kexec can no longer be used, and
+the toggle cannot be set back to false. This allows a kexec image to be
+loaded before disabling the syscall, allowing a system to set up (and
+later use) an image without it being altered. Generally used together
+with the "modules_disabled" sysctl.
+
+==============================================================
+
 kptr_restrict:
 
 This toggle indicates whether restrictions are placed on
@@ -331,7 +344,7 @@ A toggle value indicating if modules are allowed to be loaded
 in an otherwise modular kernel.  This toggle defaults to off
 (0), but can be set true (1).  Once true, modules can be
 neither loaded nor unloaded, and the toggle cannot be set back
-to false.
+to false.  Generally used with the "kexec_load_disabled" toggle.
 
 ==============================================================
 

Documentation/trace/postprocess/trace-vmscan-postprocess.pl

View file

diff --git a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
index 4a37c47..00e425f 100644
--- a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
+++ b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
@@ -123,7 +123,7 @@ my $regex_writepage;
 
 # Static regex used. Specified like this for readability and for use with /o
 #                      (process_pid)     (cpus      )   ( time  )   (tpoint    ) (details)
-my $regex_traceevent = '\s*([a-zA-Z0-9-]*)\s*(\[[0-9]*\])\s*([0-9.]*):\s*([a-zA-Z_]*):\s*(.*)';
+my $regex_traceevent = '\s*([a-zA-Z0-9-]*)\s*(\[[0-9]*\])(\s*[dX.][Nnp.][Hhs.][0-9a-fA-F.]*|)\s*([0-9.]*):\s*([a-zA-Z_]*):\s*(.*)';
 my $regex_statname = '[-0-9]*\s\((.*)\).*';
 my $regex_statppid = '[-0-9]*\s\(.*\)\s[A-Za-z]\s([0-9]*).*';
 
@@ -270,8 +270,8 @@ EVENT_PROCESS:
 	while ($traceevent = <STDIN>) {
 		if ($traceevent =~ /$regex_traceevent/o) {
 			$process_pid = $1;
-			$timestamp = $3;
-			$tracepoint = $4;
+			$timestamp = $4;
+			$tracepoint = $5;
 
 			$process_pid =~ /(.*)-([0-9]*)$/;
 			my $process = $1;
@@ -299,7 +299,7 @@ EVENT_PROCESS:
 			$perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN}++;
 			$perprocesspid{$process_pid}->{STATE_DIRECT_BEGIN} = $timestamp;
 
-			$details = $5;
+			$details = $6;
 			if ($details !~ /$regex_direct_begin/o) {
 				print "WARNING: Failed to parse mm_vmscan_direct_reclaim_begin as expected\n";
 				print "         $details\n";
@@ -322,7 +322,7 @@ EVENT_PROCESS:
 				$perprocesspid{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index] = "$order-$latency";
 			}
 		} elsif ($tracepoint eq "mm_vmscan_kswapd_wake") {
-			$details = $5;
+			$details = $6;
 			if ($details !~ /$regex_kswapd_wake/o) {
 				print "WARNING: Failed to parse mm_vmscan_kswapd_wake as expected\n";
 				print "         $details\n";
@@ -356,7 +356,7 @@ EVENT_PROCESS:
 		} elsif ($tracepoint eq "mm_vmscan_wakeup_kswapd") {
 			$perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD}++;
 
-			$details = $5;
+			$details = $6;
 			if ($details !~ /$regex_wakeup_kswapd/o) {
 				print "WARNING: Failed to parse mm_vmscan_wakeup_kswapd as expected\n";
 				print "         $details\n";
@@ -366,7 +366,7 @@ EVENT_PROCESS:
 			my $order = $3;
 			$perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD_PERORDER}[$order]++;
 		} elsif ($tracepoint eq "mm_vmscan_lru_isolate") {
-			$details = $5;
+			$details = $6;
 			if ($details !~ /$regex_lru_isolate/o) {
 				print "WARNING: Failed to parse mm_vmscan_lru_isolate as expected\n";
 				print "         $details\n";
@@ -387,7 +387,7 @@ EVENT_PROCESS:
 			}
 			$perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;
 		} elsif ($tracepoint eq "mm_vmscan_lru_shrink_inactive") {
-			$details = $5;
+			$details = $6;
 			if ($details !~ /$regex_lru_shrink_inactive/o) {
 				print "WARNING: Failed to parse mm_vmscan_lru_shrink_inactive as expected\n";
 				print "         $details\n";
@@ -397,7 +397,7 @@ EVENT_PROCESS:
 			my $nr_reclaimed = $4;
 			$perprocesspid{$process_pid}->{HIGH_NR_RECLAIMED} += $nr_reclaimed;
 		} elsif ($tracepoint eq "mm_vmscan_writepage") {
-			$details = $5;
+			$details = $6;
 			if ($details !~ /$regex_writepage/o) {
 				print "WARNING: Failed to parse mm_vmscan_writepage as expected\n";
 				print "         $details\n";

Documentation/vm/locking

View before deletion

diff --git a/Documentation/vm/locking b/Documentation/vm/locking
deleted file mode 100644
index f61228b..0000000
--- a/Documentation/vm/locking
+++ /dev/null
@@ -1,130 +0,0 @@
-Started Oct 1999 by Kanoj Sarcar <[email protected]>
-
-The intent of this file is to have an uptodate, running commentary 
-from different people about how locking and synchronization is done 
-in the Linux vm code.
-
-page_table_lock & mmap_sem
---------------------------------------
-
-Page stealers pick processes out of the process pool and scan for 
-the best process to steal pages from. To guarantee the existence 
-of the victim mm, a mm_count inc and a mmdrop are done in swap_out().
-Page stealers hold kernel_lock to protect against a bunch of races.
-The vma list of the victim mm is also scanned by the stealer, 
-and the page_table_lock is used to preserve list sanity against the
-process adding/deleting to the list. This also guarantees existence
-of the vma. Vma existence is not guaranteed once try_to_swap_out() 
-drops the page_table_lock. To guarantee the existence of the underlying 
-file structure, a get_file is done before the swapout() method is 
-invoked. The page passed into swapout() is guaranteed not to be reused
-for a different purpose because the page reference count due to being
-present in the user's pte is not released till after swapout() returns.
-
-Any code that modifies the vmlist, or the vm_start/vm_end/
-vm_flags:VM_LOCKED/vm_next of any vma *in the list* must prevent 
-kswapd from looking at the chain.
-
-The rules are:
-1. To scan the vmlist (look but don't touch) you must hold the
-   mmap_sem with read bias, i.e. down_read(&mm->mmap_sem)
-2. To modify the vmlist you need to hold the mmap_sem with
-   read&write bias, i.e. down_write(&mm->mmap_sem)  *AND*