Commit f1d6e17f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge a bunch of fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  fs/proc/task_mmu.c: fix buffer overflow in add_page_map()
  arch: *: Kconfig: add "kernel/Kconfig.freezer" to "arch/*/Kconfig"
  ocfs2: fix null pointer dereference in ocfs2_dir_foreach_blk_id()
  x86 get_unmapped_area(): use proper mmap base for bottom-up direction
  ocfs2: fix NULL pointer dereference in ocfs2_duplicate_clusters_by_page
  ocfs2: Revert 40bd62eb to avoid regression in extended allocation
  drivers/rtc/rtc-stmp3xxx.c: provide timeout for potentially endless loop polling a HW bit
  hugetlb: fix lockdep splat caused by pmd sharing
  aoe: adjust ref of head for compound page tails
  microblaze: fix clone syscall
  mm: save soft-dirty bits on file pages
  mm: save soft-dirty bits on swapped pages
  memcg: don't initialize kmem-cache destroying work for root caches
parents 28fbc8b6 8c829622

arch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -407,6 +407,12 @@ config CLONE_BACKWARDS2 
	help

	  Architecture has the first two arguments of clone(2) swapped.



config CLONE_BACKWARDS3

	bool

	help

	  Architecture has tls passed as the 3rd argument of clone(2),

	  not the 5th one.



config ODD_RT_SIGACTION

	bool

	help

arch/hexagon/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ source "kernel/Kconfig.hz" 
endmenu



source "init/Kconfig"

source "kernel/Kconfig.freezer"

source "drivers/Kconfig"

source "fs/Kconfig"

arch/microblaze/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ config MICROBLAZE 
	select GENERIC_CLOCKEVENTS

	select GENERIC_IDLE_POLL_SETUP

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS

	select CLONE_BACKWARDS3



config SWAP

	def_bool n

arch/openrisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ config GENERIC_CSUM 


source "init/Kconfig"



source "kernel/Kconfig.freezer"



menu "Processor type and features"

arch/score/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ config STACKTRACE_SUPPORT 


source "init/Kconfig"



source "kernel/Kconfig.freezer"



config MMU

	def_bool y

CRA Git | Maintained and supported by SUSTech CRA and CCSE