Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d003af2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "20 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  Documentation/sysctl/vm.txt: update numa_zonelist_order description
  lib/stackdepot.c: allow the stack trace hash to be zero
  rapidio: fix potential NULL pointer dereference
  mm/memory-failure: fix race with compound page split/merge
  ocfs2/dlm: return zero if deref_done message is successfully handled
  Ananth has moved
  kcov: don't profile branches in kcov
  kcov: don't trace the code coverage code
  mm: wake kcompactd before kswapd's short sleep
  .mailmap: add Frank Rowand
  mm/hwpoison: fix wrong num_poisoned_pages accounting
  mm: call swap_slot_free_notify() with page lock held
  mm: vmscan: reclaim highmem zone if buffer_heads is over limit
  numa: fix /proc/<pid>/numa_maps for THP
  mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA check
  mailmap: fix Krzysztof Kozlowski's misspelled name
  thp: keep huge zero page pinned until tlb flush
  mm: exclude HugeTLB pages from THP page_mapped() logic
  kexec: export OFFSET(page.compound_head) to find out compound tail page
  kexec: update VMCOREINFO for compound_order/dtor
parents 92c19ea9 7c88a292

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ Felix Kuhling <fxkuehl@gmx.de> 
Felix Moeller <felix@derklecks.de>

Filipe Lautert <filipe@icewall.org>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>

Frank Zago <fzago@systemfabricworks.com>

Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>
@@ -79,6 +82,7 @@ Kay Sievers <kay.sievers@vrfy.org> 
Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Documentation/sysctl/vm.txt

+10 −9
Original line number Diff line number Diff line
@@ -581,15 +581,16 @@ Specify "[Nn]ode" for node order 
"Zone Order" orders the zonelists by zone type, then by node within each

zone.  Specify "[Zz]one" for zone order.



Specify "[Dd]efault" to request automatic configuration.  Autoconfiguration

will select "node" order in following case.

(1) if the DMA zone does not exist or

(2) if the DMA zone comprises greater than 50% of the available memory or

(3) if any node's DMA zone comprises greater than 70% of its local memory and

    the amount of local memory is big enough.



Otherwise, "zone" order will be selected. Default order is recommended unless

this is causing problems for your system/application.

Specify "[Dd]efault" to request automatic configuration.



On 32-bit, the Normal zone needs to be preserved for allocations accessible

by the kernel, so "zone" order will be selected.



On 64-bit, devices that require DMA32/DMA are relatively rare, so "node"

order will be selected.



Default order is recommended unless this is causing problems for your

system/application.



==============================================================

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6400,7 +6400,7 @@ F: mm/kmemleak.c 
F:	mm/kmemleak-test.c



KPROBES

M:	Ananth N Mavinakayanahalli <ananth@in.ibm.com>

M:	Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>

M:	Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>

M:	"David S. Miller" <davem@davemloft.net>

M:	Masami Hiramatsu <mhiramat@kernel.org>

drivers/rapidio/devices/rio_mport_cdev.c

+2 −2
Original line number Diff line number Diff line
@@ -2669,9 +2669,9 @@ static int __init mport_init(void) 


	/* Create device class needed by udev */

	dev_class = class_create(THIS_MODULE, DRV_NAME);

	if (!dev_class) {

	if (IS_ERR(dev_class)) {

		rmcd_error("Unable to create " DRV_NAME " class");

		return -EINVAL;

		return PTR_ERR(dev_class);

	}



	ret = alloc_chrdev_region(&dev_number, 0, RIO_MAX_MPORTS, DRV_NAME);

fs/ocfs2/dlm/dlmmaster.c

+2 −0
Original line number Diff line number Diff line
@@ -2455,6 +2455,8 @@ int dlm_deref_lockres_done_handler(struct o2net_msg *msg, u32 len, void *data, 


	spin_unlock(&dlm->spinlock);



	ret = 0;



done:

	dlm_put(dlm);

	return ret;