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

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

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "14 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  rapidio/tsi721: fix incorrect detection of address translation condition
  rapidio/documentation/mport_cdev: add missing parameter description
  kernel/fork: fix CLONE_CHILD_CLEARTID regression in nscd
  MAINTAINERS: Vladimir has moved
  mm, mempolicy: task->mempolicy must be NULL before dropping final reference
  printk/nmi: avoid direct printk()-s from __printk_nmi_flush()
  treewide: remove references to the now unnecessary DEFINE_PCI_DEVICE_TABLE
  drivers/scsi/wd719x.c: remove last declaration using DEFINE_PCI_DEVICE_TABLE
  mm, vmscan: only allocate and reclaim from zones with pages managed by the buddy allocator
  lib/test_hash.c: fix warning in preprocessor symbol evaluation
  lib/test_hash.c: fix warning in two-dimensional array init
  kconfig: tinyconfig: provide whole choice blocks to avoid warnings
  kexec: fix double-free when failing to relocate the purgatory
  mm, oom: prevent premature OOM killer invocation for high order request
parents 511a8cdb b3006929

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/PCI/pci.txt

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver 


The ID table is an array of struct pci_device_id entries ending with an

all-zero entry.  Definitions with static const are generally preferred.

Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.



Each entry consists of:

Documentation/rapidio/mport_cdev.txt

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ functionality of their platform when planning to use this driver: 


III. Module parameters



- 'dma_timeout' - DMA transfer completion timeout (in msec, default value 3000).

        This parameter set a maximum completion wait time for SYNC mode DMA

        transfer requests and for RIO_WAIT_FOR_ASYNC ioctl requests.



- 'dbg_level' - This parameter allows to control amount of debug information

        generated by this device driver. This parameter is formed by set of

        bit masks that correspond to the specific functional blocks.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3247,7 +3247,7 @@ F: kernel/cpuset.c 
CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)

M:	Johannes Weiner <hannes@cmpxchg.org>

M:	Michal Hocko <mhocko@kernel.org>

M:	Vladimir Davydov <vdavydov@virtuozzo.com>

M:	Vladimir Davydov <vdavydov.dev@gmail.com>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org

S:	Maintained

arch/x86/configs/tiny.config

+2 −0
Original line number Diff line number Diff line 
CONFIG_NOHIGHMEM=y

# CONFIG_HIGHMEM4G is not set

# CONFIG_HIGHMEM64G is not set