summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-20 22:31:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-20 22:31:33 -0700
commit5469dc270cd44c451590d40c031e6a71c1f637e8 (patch)
tree5ca6330c2d754dbe82bfa75964a7f828f364e48f
parent2f37dd131c5d3a2eac21cd5baf80658b1b02a8ac (diff)
parentea9b50133ffebbd580cb5cd0aa222784d7a2fcb1 (diff)
Merge branch 'akpm' (patches from Andrew)
Merge more updates from Andrew Morton: - the rest of MM - KASAN updates - procfs updates - exit, fork updates - printk updates - lib/ updates - radix-tree testsuite updates - checkpatch updates - kprobes updates - a few other misc bits * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (162 commits) samples/kprobes: print out the symbol name for the hooks samples/kprobes: add a new module parameter kprobes: add the "tls" argument for j_do_fork init/main.c: simplify initcall_blacklisted() fs/efs/super.c: fix return value checkpatch: improve --git <commit-count> shortcut checkpatch: reduce number of `git log` calls with --git checkpatch: add support to check already applied git commits checkpatch: add --list-types to show message types to show or ignore checkpatch: advertise the --fix and --fix-inplace options more checkpatch: whine about ACCESS_ONCE checkpatch: add test for keywords not starting on tabstops checkpatch: improve CONSTANT_COMPARISON test for structure members checkpatch: add PREFER_IS_ENABLED test lib/GCD.c: use binary GCD algorithm instead of Euclidean radix-tree: free up the bottom bit of exceptional entries for reuse dax: move RADIX_DAX_ definitions to dax.c radix-tree: make radix_tree_descend() more useful radix-tree: introduce radix_tree_replace_clear_tags() radix-tree: tidy up __radix_tree_create() ...
-rw-r--r--Documentation/ABI/testing/sysfs-block-zram9
-rw-r--r--Documentation/blockdev/zram.txt28
-rw-r--r--Documentation/filesystems/proc.txt1
-rw-r--r--Documentation/vm/transhuge.txt12
-rw-r--r--Documentation/vm/z3fold.txt26
-rw-r--r--MAINTAINERS8
-rw-r--r--arch/Kconfig12
-rw-r--r--arch/alpha/Kconfig1
-rw-r--r--arch/alpha/kernel/process.c8
-rw-r--r--arch/arc/Kconfig1
-rw-r--r--arch/arc/kernel/process.c7
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/kernel/process.c4
-rw-r--r--arch/arm/kernel/smp.c2
-rw-r--r--arch/arm/mm/Kconfig3
-rw-r--r--arch/arm/vfp/vfpmodule.c4
-rw-r--r--arch/arm64/kernel/process.c7
-rw-r--r--arch/avr32/Kconfig2
-rw-r--r--arch/avr32/kernel/process.c4
-rw-r--r--arch/blackfin/Kconfig1
-rw-r--r--arch/blackfin/include/asm/processor.h7
-rw-r--r--arch/c6x/kernel/process.c4
-rw-r--r--arch/cris/Kconfig2
-rw-r--r--arch/cris/arch-v10/kernel/process.c9
-rw-r--r--arch/cris/arch-v32/kernel/process.c4
-rw-r--r--arch/frv/include/asm/processor.h7
-rw-r--r--arch/h8300/Kconfig1
-rw-r--r--arch/h8300/include/asm/processor.h7
-rw-r--r--arch/hexagon/kernel/process.c7
-rw-r--r--arch/ia64/Kconfig1
-rw-r--r--arch/ia64/kernel/perfmon.c4
-rw-r--r--arch/ia64/kernel/process.c14
-rw-r--r--arch/m32r/Kconfig1
-rw-r--r--arch/m32r/kernel/process.c9
-rw-r--r--arch/m68k/Kconfig.cpu11
-rw-r--r--arch/m68k/include/asm/processor.h7
-rw-r--r--arch/metag/Kconfig2
-rw-r--r--arch/metag/include/asm/processor.h2
-rw-r--r--arch/metag/kernel/process.c6
-rw-r--r--arch/microblaze/Kconfig1
-rw-r--r--arch/microblaze/include/asm/processor.h10
-rw-r--r--arch/mips/Kconfig1
-rw-r--r--arch/mips/include/asm/cpu-features.h10
-rw-r--r--arch/mips/kernel/process.c4
-rw-r--r--arch/mn10300/Kconfig1
-rw-r--r--arch/mn10300/include/asm/fpu.h6
-rw-r--r--arch/mn10300/kernel/process.c4
-rw-r--r--arch/nios2/Kconfig1
-rw-r--r--arch/nios2/include/asm/processor.h5
-rw-r--r--arch/openrisc/Kconfig1
-rw-r--r--arch/openrisc/include/asm/processor.h9
-rw-r--r--arch/parisc/Kconfig1
-rw-r--r--arch/parisc/kernel/process.c7
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/powerpc/kernel/process.c4
-rw-r--r--arch/s390/Kconfig3
-rw-r--r--arch/s390/kernel/process.c5
-rw-r--r--arch/score/Kconfig1
-rw-r--r--arch/score/kernel/process.c2
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/kernel/process_32.c7
-rw-r--r--arch/sh/kernel/process_64.c5
-rw-r--r--arch/sparc/Kconfig3
-rw-r--r--arch/sparc/kernel/process_32.c12
-rw-r--r--arch/sparc/kernel/process_64.c4
-rw-r--r--arch/tile/Kconfig2
-rw-r--r--arch/tile/kernel/process.c4
-rw-r--r--arch/um/kernel/process.c4
-rw-r--r--arch/unicore32/kernel/process.c7
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/x86/include/asm/uaccess.h5
-rw-r--r--arch/x86/include/asm/uaccess_64.h7
-rw-r--r--arch/x86/kernel/apic/hw_nmi.c1
-rw-r--r--arch/x86/kernel/process.c5
-rw-r--r--arch/xtensa/Kconfig1
-rw-r--r--arch/xtensa/kernel/process.c4
-rw-r--r--block/partitions/ldm.c60
-rw-r--r--drivers/block/zram/zcomp.c300
-rw-r--r--drivers/block/zram/zcomp.h14
-rw-r--r--drivers/block/zram/zram_drv.c104
-rw-r--r--drivers/block/zram/zram_drv.h2
-rw-r--r--drivers/char/random.c21
-rw-r--r--drivers/hwspinlock/hwspinlock_core.c2
-rw-r--r--drivers/platform/x86/wmi.c104
-rw-r--r--fs/btrfs/volumes.c2
-rw-r--r--fs/dax.c9
-rw-r--r--fs/efivarfs/inode.c40
-rw-r--r--fs/efs/super.c4
-rw-r--r--fs/ext4/ioctl.c2
-rw-r--r--fs/f2fs/file.c2
-rw-r--r--fs/fs-writeback.c3
-rw-r--r--fs/proc/array.c20
-rw-r--r--fs/proc/base.c42
-rw-r--r--fs/ramfs/file-nommu.c8
-rw-r--r--fs/reiserfs/objectid.c2
-rw-r--r--fs/ubifs/sb.c2
-rw-r--r--fs/userfaultfd.c41
-rw-r--r--include/linux/compaction.h145
-rw-r--r--include/linux/efi.h14
-rw-r--r--include/linux/genhd.h23
-rw-r--r--include/linux/hardirq.h2
-rw-r--r--include/linux/hugetlb.h10
-rw-r--r--include/linux/hugetlb_cgroup.h4
-rw-r--r--include/linux/kasan-checks.h12
-rw-r--r--include/linux/kasan.h13
-rw-r--r--include/linux/memcontrol.h25
-rw-r--r--include/linux/mm.h10
-rw-r--r--include/linux/mm_types.h2
-rw-r--r--include/linux/mmzone.h5
-rw-r--r--include/linux/oom.h15
-rw-r--r--include/linux/page-flags.h18
-rw-r--r--include/linux/pagemap.h24
-rw-r--r--include/linux/percpu.h3
-rw-r--r--include/linux/printk.h14
-rw-r--r--include/linux/radix-tree.h180
-rw-r--r--include/linux/random.h1
-rw-r--r--include/linux/sched.h23
-rw-r--r--include/linux/swap.h1
-rw-r--r--include/linux/syscalls.h8
-rw-r--r--include/linux/uuid.h21
-rw-r--r--include/linux/vmalloc.h3
-rw-r--r--include/linux/zsmalloc.h4
-rw-r--r--include/trace/events/compaction.h3
-rw-r--r--include/uapi/linux/uuid.h4
-rw-r--r--init/Kconfig27
-rw-r--r--init/main.c13
-rw-r--r--kernel/exit.c2
-rw-r--r--kernel/fork.c54
-rw-r--r--kernel/irq/irqdomain.c7
-rw-r--r--kernel/kexec_core.c1
-rw-r--r--kernel/panic.c6
-rw-r--r--kernel/printk/Makefile1
-rw-r--r--kernel/printk/internal.h57
-rw-r--r--kernel/printk/nmi.c260
-rw-r--r--kernel/printk/printk.c31
-rw-r--r--kernel/sysctl_binary.c23
-rw-r--r--lib/Kconfig3
-rw-r--r--lib/gcd.c77
-rw-r--r--lib/nmi_backtrace.c89
-rw-r--r--lib/radix-tree.c933
-rw-r--r--lib/strncpy_from_user.c2
-rw-r--r--lib/test_kasan.c69
-rw-r--r--lib/uuid.c91
-rw-r--r--lib/vsprintf.c21
-rw-r--r--mm/Kconfig13