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

Commit 9f30931a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "9 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2/dlm: unlock lockres spinlock before dlm_lockres_put
  fault-inject: fix inverted interval/probability values in printk
  lib/Kconfig.debug: disable -Wframe-larger-than warnings with KASAN=y
  mm: make sendfile(2) killable
  thp: use is_zero_pfn() only after pte_present() check
  mailmap: update Javier Martinez Canillas' email
  MAINTAINERS: add Sergey as zsmalloc reviewer
  mm: cma: fix incorrect type conversion for size during dma allocation
  kmod: don't run async usermode helper as a child of kworker thread
parents a2c01ed5 b67de018

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ James Bottomley <jejb@mulgrave.(none)> 
James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

James Ketrenos <jketreno@io.(none)>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11675,6 +11675,7 @@ F: drivers/tty/serial/zs.* 
ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR

M:	Minchan Kim <minchan@kernel.org>

M:	Nitin Gupta <ngupta@vflare.org>

R:	Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	mm/zsmalloc.c

drivers/base/dma-contiguous.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base, 
 * global one. Requires architecture specific dev_get_cma_area() helper

 * function.

 */

struct page *dma_alloc_from_contiguous(struct device *dev, int count,

struct page *dma_alloc_from_contiguous(struct device *dev, size_t count,

				       unsigned int align)

{

	if (align > CONFIG_CMA_ALIGNMENT)

fs/ocfs2/dlm/dlmmaster.c

+2 −1
Original line number Diff line number Diff line
@@ -1658,12 +1658,13 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data, 
		if (ret < 0) {

			mlog(ML_ERROR, "failed to dispatch assert master work\n");

			response = DLM_MASTER_RESP_ERROR;

			spin_unlock(&res->spinlock);

			dlm_lockres_put(res);

		} else {

			dispatched = 1;

			__dlm_lockres_grab_inflight_worker(dlm, res);

		}

			spin_unlock(&res->spinlock);

		}

	} else {

		if (res)

			dlm_lockres_put(res);

fs/ocfs2/dlm/dlmrecovery.c

+1 −1
Original line number Diff line number Diff line
@@ -1723,8 +1723,8 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data, 
			} else {

				dispatched = 1;

				__dlm_lockres_grab_inflight_worker(dlm, res);

			}

				spin_unlock(&res->spinlock);

			}

		} else {

			/* put.. incase we are not the master */

			spin_unlock(&res->spinlock);