Commit 12c0ab66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "12 patches.

  Subsystems affected by this patch series: mm (memcg, zsmalloc, swap,
  mailmap, selftests, pagecache, hugetlb, pagemap), lib, and coredump"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/mmap.c: fix mmap return value when vma is merged after call_mmap()
  hugetlb_cgroup: fix offline of hugetlb cgroup with reservations
  mm/filemap: add static for function __add_to_page_cache_locked
  userfaultfd: selftests: fix SIGSEGV if huge mmap fails
  tools/testing/selftests/vm: fix build error
  mailmap: add two more addresses of Uwe Kleine-König
  mm/swapfile: do not sleep with a spin lock held
  mm/zsmalloc.c: drop ZSMALLOC_PGTABLE_MAPPING
  mm: list_lru: set shrinker map bit when child nr_items is not zero
  mm: memcg/slab: fix obj_cgroup_charge() return value handling
  coredump: fix core_pattern parse error
  zlib: export S390 symbols for zlib modules
parents 7059c2c0 309d08d9

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn> 
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

arch/arm/configs/omap2plus_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_BINFMT_MISC=y

CONFIG_CMA=y

CONFIG_ZSMALLOC=m

CONFIG_ZSMALLOC_PGTABLE_MAPPING=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

fs/coredump.c

+2 −1
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm, 
		 */

		if (ispipe) {

			if (isspace(*pat_ptr)) {

				if (cn->used != 0)

					was_space = true;

				pat_ptr++;

				continue;

include/linux/zsmalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
 * zsmalloc mapping modes

 *

 * NOTE: These only make a difference when a mapped object spans pages.

 * They also have no effect when ZSMALLOC_PGTABLE_MAPPING is selected.

 */

enum zs_mapmode {

	ZS_MM_RW, /* normal read-write mapping */

lib/zlib_dfltcc/dfltcc_inflate.c

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "dfltcc_util.h"

#include "dfltcc.h"

#include <asm/setup.h>

#include <linux/export.h>

#include <linux/zutil.h>



/*
@@ -29,6 +30,7 @@ int dfltcc_can_inflate( 
    return is_bit_set(dfltcc_state->af.fns, DFLTCC_XPND) &&

               is_bit_set(dfltcc_state->af.fmts, DFLTCC_FMT0);

}

EXPORT_SYMBOL(dfltcc_can_inflate);



static int dfltcc_was_inflate_used(

    z_streamp strm
@@ -147,3 +149,4 @@ dfltcc_inflate_action dfltcc_inflate( 
    return (cc == DFLTCC_CC_OP1_TOO_SHORT || cc == DFLTCC_CC_OP2_TOO_SHORT) ?

        DFLTCC_INFLATE_BREAK : DFLTCC_INFLATE_CONTINUE;

}

EXPORT_SYMBOL(dfltcc_inflate);

CRA Git | Maintained and supported by SUSTech CRA and CCSE