]> Git Repo - linux.git/commitdiff
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <[email protected]>
Fri, 23 Oct 2015 13:10:51 +0000 (22:10 +0900)
committerLinus Torvalds <[email protected]>
Fri, 23 Oct 2015 13:10:51 +0000 (22:10 +0900)
Merge fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <[email protected]>:
  ocfs2/dlm: unlock lockres spinlock before dlm_lockres_put
  fault-inject: fix inverted interval/probability values in printk
  lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y
  mm: make sendfile(2) killable
  thp: use is_zero_pfn() only after pte_present() check
  mailmap: update Javier Martinez Canillas' email
  MAINTAINERS: add Sergey as zsmalloc reviewer
  mm: cma: fix incorrect type conversion for size during dma allocation
  kmod: don't run async usermode helper as a child of kworker thread

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index ddc88c089c481b4d4cfe89cab5c81f7a05325ba0,d1116d9ea6ae1e21722063338f6fa973855315bc..9de185da5f5b0dfe1be0730b8248b3aff44e0c84
@@@ -894,12 -894,11 +894,12 @@@ M:      Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -ARM/Allwinner A1X SoC support
 +ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <[email protected]>
 +M:    Chen-Yu Tsai <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -N:    sun[x4567]i
 +N:    sun[x456789]i
  
  ARM/Allwinner SoC Clock Support
  M:    Emilio López <[email protected]>
@@@ -11675,6 -11674,7 +11675,7 @@@ F:   drivers/tty/serial/zs.
  ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR
  M:    Minchan Kim <[email protected]>
  M:    Nitin Gupta <[email protected]>
+ R:    Sergey Senozhatsky <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    mm/zsmalloc.c
This page took 0.076716 seconds and 4 git commands to generate.