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

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

Merge branch 'akpm' (incoming from Andrew) 

Merge misc fixes from Andrew Morton:
 "13 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  thp: close race between split and zap huge pages
  mm: fix new kernel-doc warning in filemap.c
  mm: fix CONFIG_DEBUG_VM_RB description
  mm: use paravirt friendly ops for NUMA hinting ptes
  mips: export flush_icache_range
  mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
  wait: explain the shadowing and type inconsistencies
  Shiraz has moved
  Documentation/vm/numa_memory_policy.txt: fix wrong document in numa_memory_policy.txt
  powerpc/mm: fix ".__node_distance" undefined
  kernel/watchdog.c:touch_softlockup_watchdog(): use raw_cpu_write()
  init/Kconfig: move the trusted keyring config option to general setup
  vmscan: reclaim_clean_pages_from_list() must use mod_zone_page_state()
parents 38137a51 b5a8cad3

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com> 
Sam Ravnborg <sam@mars.ravnborg.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Documentation/vm/numa_memory_policy.txt

+2 −3
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ Components of Memory Policies 
	allocation fails, the kernel will search other nodes, in order of

	increasing distance from the preferred node based on information

	provided by the platform firmware.

	containing the cpu where the allocation takes place.



	    Internally, the Preferred policy uses a single node--the

	    preferred_node member of struct mempolicy.  When the internal
@@ -275,9 +274,9 @@ Components of Memory Policies 
	    For example, consider a task that is attached to a cpuset with

	    mems 2-5 that sets an Interleave policy over the same set with

	    MPOL_F_RELATIVE_NODES.  If the cpuset's mems change to 3-7, the

	    interleave now occurs over nodes 3,5-6.  If the cpuset's mems

	    interleave now occurs over nodes 3,5-7.  If the cpuset's mems

	    then change to 0,2-3,5, then the interleave occurs over nodes

	    0,3,5.

	    0,2-3,5.



	    Thanks to the consistent remapping, applications preparing

	    nodemasks to specify memory policies using this flag should

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8315,7 +8315,7 @@ F: include/linux/compiler.h 


SPEAR PLATFORM SUPPORT

M:	Viresh Kumar <viresh.linux@gmail.com>

M:	Shiraz Hashim <shiraz.hashim@st.com>

M:	Shiraz Hashim <shiraz.linux.kernel@gmail.com>

L:	spear-devel@list.st.com

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

W:	http://www.st.com/spear

arch/arm/boot/dts/spear320-hmi.dts

+1 −1
Original line number Diff line number Diff line 
/*

 * DTS file for SPEAr320 Evaluation Baord

 *

 * Copyright 2012 Shiraz Hashim <shiraz.hashim@st.com>

 * Copyright 2012 Shiraz Hashim <shiraz.linux.kernel@gmail.com>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

arch/arm/mach-spear/headsmp.S

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Picked from realview

 * Copyright (c) 2012 ST Microelectronics Limited

 * Shiraz Hashim <shiraz.hashim@st.com>

 * Shiraz Hashim <shiraz.linux.kernel@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as