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

Commit 7a752478 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:

 - "fork: unconditionally clear stack on fork" is a non-bugfix which got
   lost during the merge window - performance concerns appear to have
   been adequately addressed.

 - and a bunch of fixes

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/filemap.c: fix NULL pointer in page_cache_tree_insert()
  mm: memcg: add __GFP_NOWARN in __memcg_schedule_kmem_cache_create()
  fs, elf: don't complain MAP_FIXED_NOREPLACE unless -EEXIST error
  kexec_file: do not add extra alignment to efi memmap
  proc: fix /proc/loadavg regression
  proc: revalidate kernel thread inodes to root:root
  autofs: mount point create should honour passed in mode
  MAINTAINERS: add personal addresses for Sascha and Uwe
  kasan: add no_sanitize attribute for clang builds
  rapidio: fix rio_dma_transfer error handling
  mm: enable thp migration for shmem thp
  writeback: safer lock nesting
  mm, pagemap: fix swap offset value for PMD migration entry
  mm: fix do_pages_move status handling
  fork: unconditionally clear stack on fork
parents 83beed7b abc1be13

MAINTAINERS

+10 −5
Original line number Diff line number Diff line
@@ -1373,7 +1373,8 @@ F: arch/arm/mach-ebsa110/ 
F:	drivers/net/ethernet/amd/am79c961a.*



ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT

M:	Uwe Kleine-König <kernel@pengutronix.de>

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

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

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

S:	Maintained

N:	efm32
@@ -1401,7 +1402,8 @@ F: arch/arm/mach-footbridge/ 


ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

M:	Shawn Guo <shawnguo@kernel.org>

M:	Sascha Hauer <kernel@pengutronix.de>

M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

R:	Fabio Estevam <fabio.estevam@nxp.com>

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

S:	Maintained
@@ -1416,7 +1418,8 @@ F: include/soc/imx/ 


ARM/FREESCALE VYBRID ARM ARCHITECTURE

M:	Shawn Guo <shawnguo@kernel.org>

M:	Sascha Hauer <kernel@pengutronix.de>

M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

R:	Stefan Agner <stefan@agner.ch>

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

S:	Maintained
@@ -5652,7 +5655,8 @@ F: drivers/net/ethernet/freescale/fec.h 
F:	Documentation/devicetree/bindings/net/fsl-fec.txt



FREESCALE IMX / MXC FRAMEBUFFER DRIVER

M:	Sascha Hauer <kernel@pengutronix.de>

M:	Sascha Hauer <s.hauer@pengutronix.de>

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

L:	linux-fbdev@vger.kernel.org

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

S:	Maintained
@@ -12825,7 +12829,8 @@ F: include/linux/siphash.h 


SIOX

M:	Gavin Schenk <g.schenk@eckelmann.de>

M:	Uwe Kleine-König <kernel@pengutronix.de>

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

R:	Pengutronix Kernel Team <kernel@pengutronix.de>

S:	Supported

F:	drivers/siox/*

F:	include/trace/events/siox.h

arch/powerpc/platforms/cell/spufs/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ static int show_spu_loadavg(struct seq_file *s, void *private) 
		LOAD_INT(c), LOAD_FRAC(c),

		count_active_contexts(),

		atomic_read(&nr_spu_contexts),

		idr_get_cursor(&task_active_pid_ns(current)->idr));

		idr_get_cursor(&task_active_pid_ns(current)->idr) - 1);

	return 0;

}

arch/x86/kernel/kexec-bzimage64.c

+2 −3
Original line number Diff line number Diff line
@@ -398,11 +398,10 @@ static void *bzImage64_load(struct kimage *image, char *kernel, 
	 * little bit simple

	 */

	efi_map_sz = efi_get_runtime_map_size();

	efi_map_sz = ALIGN(efi_map_sz, 16);

	params_cmdline_sz = sizeof(struct boot_params) + cmdline_len +

				MAX_ELFCOREHDR_STR_LEN;

	params_cmdline_sz = ALIGN(params_cmdline_sz, 16);

	kbuf.bufsz = params_cmdline_sz + efi_map_sz +

	kbuf.bufsz = params_cmdline_sz + ALIGN(efi_map_sz, 16) +

				sizeof(struct setup_data) +

				sizeof(struct efi_setup_data);
@@ -410,7 +409,7 @@ static void *bzImage64_load(struct kimage *image, char *kernel, 
	if (!params)

		return ERR_PTR(-ENOMEM);

	efi_map_offset = params_cmdline_sz;

	efi_setup_data_offset = efi_map_offset + efi_map_sz;

	efi_setup_data_offset = efi_map_offset + ALIGN(efi_map_sz, 16);



	/* Copy setup header onto bootparams. Documentation/x86/boot.txt */

	setup_header_size = 0x0202 + kernel[0x0201] - setup_hdr_offset;

drivers/rapidio/devices/rio_mport_cdev.c

+9 −10
Original line number Diff line number Diff line
@@ -740,10 +740,7 @@ static int do_dma_request(struct mport_dma_req *req, 
	tx->callback = dma_xfer_callback;

	tx->callback_param = req;



	req->dmach = chan;

	req->sync = sync;

	req->status = DMA_IN_PROGRESS;

	init_completion(&req->req_comp);

	kref_get(&req->refcount);



	cookie = dmaengine_submit(tx);
@@ -831,13 +828,20 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, 
	if (!req)

		return -ENOMEM;



	kref_init(&req->refcount);



	ret = get_dma_channel(priv);

	if (ret) {

		kfree(req);

		return ret;

	}

	chan = priv->dmach;



	kref_init(&req->refcount);

	init_completion(&req->req_comp);

	req->dir = dir;

	req->filp = filp;

	req->priv = priv;

	req->dmach = chan;

	req->sync = sync;



	/*

	 * If parameter loc_addr != NULL, we are transferring data from/to
@@ -925,11 +929,6 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, 
				xfer->offset, xfer->length);

	}



	req->dir = dir;

	req->filp = filp;

	req->priv = priv;

	chan = priv->dmach;



	nents = dma_map_sg(chan->device->dev,

			   req->sgt.sgl, req->sgt.nents, dir);

	if (nents == 0) {

fs/autofs4/root.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static int autofs4_dir_mkdir(struct inode *dir, 


	autofs4_del_active(dentry);



	inode = autofs4_get_inode(dir->i_sb, S_IFDIR | 0555);

	inode = autofs4_get_inode(dir->i_sb, S_IFDIR | mode);

	if (!inode)

		return -ENOMEM;

	d_add(dentry, inode);