Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - a couple of hotfixes - almost all of the rest of MM - lib/ updates - binfmt_elf updates - autofs updates - quite a lot of misc fixes and updates - reiserfs, fatfs - signals - exec - cpumask - rapidio - sysctl - pids - eventfd - gcov - panic - pps - gdb script updates - ipc updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (126 commits) mm: memcontrol: fix NUMA round-robin reclaim at intermediate level mm: memcontrol: fix recursive statistics correctness & scalabilty mm: memcontrol: move stat/event counting functions out-of-line mm: memcontrol: make cgroup stats and events query API explicitly local drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl mm, memcg: rename ambiguously named memory.stat counters and functions arch: remove <asm/sizes.h> and <asm-generic/sizes.h> treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h> fs/block_dev.c: Remove duplicate header fs/cachefiles/namei.c: remove duplicate header include/linux/sched/signal.h: replace `tsk' with `task' fs/coda/psdev.c: remove duplicate header ipc: do cyclic id allocation for the ipc object. ipc: conserve sequence numbers in ipcmni_extend mode ipc: allow boot time extension of IPCMNI from 32k to 16M ipc/mqueue: optimize msg_get() ipc/mqueue: remove redundant wq task assignment ipc: prevent lockup on alloc_msg and free_msg scripts/gdb: print cached rate in lx-clk-summary ...
Showing
- Documentation/accounting/psi.txt 107 additions, 0 deletionsDocumentation/accounting/psi.txt
- Documentation/admin-guide/kernel-parameters.txt 16 additions, 1 deletionDocumentation/admin-guide/kernel-parameters.txt
- Documentation/core-api/kernel-api.rst 2 additions, 2 deletionsDocumentation/core-api/kernel-api.rst
- Documentation/dev-tools/gcov.rst 14 additions, 4 deletionsDocumentation/dev-tools/gcov.rst
- Documentation/devicetree/bindings/pps/pps-gpio.txt 7 additions, 0 deletionsDocumentation/devicetree/bindings/pps/pps-gpio.txt
- Documentation/filesystems/autofs-mount-control.txt 4 additions, 2 deletionsDocumentation/filesystems/autofs-mount-control.txt
- Documentation/filesystems/autofs.txt 48 additions, 18 deletionsDocumentation/filesystems/autofs.txt
- arch/arm/common/sa1111.c 1 addition, 1 deletionarch/arm/common/sa1111.c
- arch/arm/include/asm/Kbuild 0 additions, 1 deletionarch/arm/include/asm/Kbuild
- arch/arm/include/asm/hardirq.h 1 addition, 0 deletionsarch/arm/include/asm/hardirq.h
- arch/arm/kernel/atags.h 1 addition, 1 deletionarch/arm/kernel/atags.h
- arch/arm/kernel/smp.c 5 additions, 1 deletionarch/arm/kernel/smp.c
- arch/arm/mach-imx/devices/platform-fec.c 1 addition, 1 deletionarch/arm/mach-imx/devices/platform-fec.c
- arch/arm/mach-imx/devices/platform-gpio_keys.c 1 addition, 1 deletionarch/arm/mach-imx/devices/platform-gpio_keys.c
- arch/arm/mach-imx/devices/platform-imx2-wdt.c 1 addition, 1 deletionarch/arm/mach-imx/devices/platform-imx2-wdt.c
- arch/arm/mach-imx/devices/platform-mxc_nand.c 1 addition, 1 deletionarch/arm/mach-imx/devices/platform-mxc_nand.c
- arch/arm/mach-imx/hardware.h 1 addition, 1 deletionarch/arm/mach-imx/hardware.h
- arch/arm/mach-integrator/impd1.c 1 addition, 1 deletionarch/arm/mach-integrator/impd1.c
- arch/arm/mach-iop13xx/pci.c 1 addition, 1 deletionarch/arm/mach-iop13xx/pci.c
- arch/arm/mach-iop13xx/tpmi.c 1 addition, 1 deletionarch/arm/mach-iop13xx/tpmi.c
Loading
Please register or sign in to comment