Merge branch 'akpm' (incoming from Andrew)
Merge second patch-bomb from Andrew Morton: - the rest of MM - zram updates - zswap updates - exit - procfs - exec - wait - crash dump - lib/idr - rapidio - adfs, affs, bfs, ufs - cris - Kconfig things - initramfs - small amount of IPC material - percpu enhancements - early ioremap support - various other misc things * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (156 commits) MAINTAINERS: update Intel C600 SAS driver maintainers fs/ufs: remove unused ufs_super_block_third pointer fs/ufs: remove unused ufs_super_block_second pointer fs/ufs: remove unused ufs_super_block_first pointer fs/ufs/super.c: add __init to init_inodecache() doc/kernel-parameters.txt: add early_ioremap_debug arm64: add early_ioremap support arm64: initialize pgprot info earlier in boot x86: use generic early_ioremap mm: create generic early_ioremap() support x86/mm: sparse warning fix for early_memremap lglock: map to spinlock when !CONFIG_SMP percpu: add preemption checks to __this_cpu ops vmstat: use raw_cpu_ops to avoid false positives on preemption checks slub: use raw_cpu_inc for incrementing statistics net: replace __this_cpu_inc in route.c with raw_cpu_inc modules: use raw_cpu_write for initialization of per cpu refcount. mm: use raw_cpu ops for determining current NUMA node percpu: add raw_cpu_ops slub: fix leak of 'name' in sysfs_slab_add ...
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-block-zram 30 additions, 9 deletionsDocumentation/ABI/testing/sysfs-block-zram
- Documentation/DocBook/kernel-hacking.tmpl 1 addition, 1 deletionDocumentation/DocBook/kernel-hacking.tmpl
- Documentation/arm64/memory.txt 2 additions, 2 deletionsDocumentation/arm64/memory.txt
- Documentation/blockdev/zram.txt 48 additions, 6 deletionsDocumentation/blockdev/zram.txt
- Documentation/cgroups/memcg_test.txt 2 additions, 2 deletionsDocumentation/cgroups/memcg_test.txt
- Documentation/cgroups/resource_counter.txt 2 additions, 10 deletionsDocumentation/cgroups/resource_counter.txt
- Documentation/filesystems/Locking 10 additions, 0 deletionsDocumentation/filesystems/Locking
- Documentation/filesystems/affs.txt 6 additions, 3 deletionsDocumentation/filesystems/affs.txt
- Documentation/filesystems/proc.txt 12 additions, 5 deletionsDocumentation/filesystems/proc.txt
- Documentation/irqflags-tracing.txt 0 additions, 7 deletionsDocumentation/irqflags-tracing.txt
- Documentation/kbuild/kconfig-language.txt 4 additions, 0 deletionsDocumentation/kbuild/kconfig-language.txt
- Documentation/kernel-parameters.txt 5 additions, 0 deletionsDocumentation/kernel-parameters.txt
- Documentation/rapidio/sysfs.txt 58 additions, 8 deletionsDocumentation/rapidio/sysfs.txt
- Documentation/scheduler/sched-arch.txt 1 addition, 1 deletionDocumentation/scheduler/sched-arch.txt
- Documentation/sysctl/kernel.txt 1 addition, 0 deletionsDocumentation/sysctl/kernel.txt
- MAINTAINERS 1 addition, 2 deletionsMAINTAINERS
- arch/arc/Kconfig 1 addition, 1 deletionarch/arc/Kconfig
- arch/arm/Kconfig 6 additions, 6 deletionsarch/arm/Kconfig
- arch/arm/mach-picoxcell/Kconfig 1 addition, 1 deletionarch/arm/mach-picoxcell/Kconfig
- arch/arm/mach-prima2/Kconfig 1 addition, 1 deletionarch/arm/mach-prima2/Kconfig
Loading
Please register or sign in to comment