Commit 8d99641f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' 

* akpm:
  kernel/smp.c: consolidate writes in smp_call_function_interrupt()
  kernel/smp.c: fix smp_call_function_many() SMP race
  memcg: correctly order reading PCG_USED and pc->mem_cgroup
  backlight: fix 88pm860x_bl macro collision
  drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
  MAINTAINERS: update Atmel AT91 entry
  mm: fix truncate_setsize() comment
  memcg: fix rmdir, force_empty with THP
  memcg: fix LRU accounting with THP
  memcg: fix USED bit handling at uncharge in THP
  memcg: modify accounting function for supporting THP better
  fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
  mm: compaction: prevent division-by-zero during user-requested compaction
  mm/vmscan.c: remove duplicate include of compaction.h
  memblock: fix memblock_is_region_memory()
  thp: keep highpte mapped until it is no longer needed
  kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
parents fc887b15 225c8e01

MAINTAINERS

+6 −2
Original line number Diff line number Diff line
@@ -624,11 +624,15 @@ M: Lennert Buytenhek <kernel@wantstofly.org> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained



ARM/ATMEL AT91RM9200 ARM ARCHITECTURE

ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES

M:	Andrew Victor <linux@maxim.org.za>

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

M:	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://maxim.org.za/at91_26.html

S:	Maintained

W:	http://www.linux4sam.org

S:	Supported

F:	arch/arm/mach-at91/



ARM/BCMRING ARM ARCHITECTURE

M:	Jiandong Zheng <jdzheng@broadcom.com>

arch/arm/configs/ag5evm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ CONFIG_NAMESPACES=y 
# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_EMBEDDED=y

CONFIG_EXPERT=y

CONFIG_SLAB=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

arch/arm/configs/am200epdkit_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ CONFIG_LOCALVERSION="gum" 
# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_EMBEDDED=y

CONFIG_EXPERT=y

# CONFIG_SYSCTL_SYSCALL is not set

# CONFIG_EPOLL is not set

# CONFIG_SHMEM is not set

arch/arm/configs/at572d940hfek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ CONFIG_SYSFS_DEPRECATED_V2=y 
CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_EMBEDDED=y

CONFIG_EXPERT=y

CONFIG_SLAB=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=m

arch/arm/configs/badge4_defconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EMBEDDED=y

CONFIG_EXPERT=y

CONFIG_MODULES=y

CONFIG_MODVERSIONS=y

CONFIG_ARCH_SA1100=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE