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

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "12 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm, vmscan: prevent kswapd livelock due to pfmemalloc-throttled process being killed
  memcg: fix destination cgroup leak on task charges migration
  mm: memcontrol: switch soft limit default back to infinity
  mm/debug_pagealloc: remove obsolete Kconfig options
  vfs: renumber FMODE_NONOTIFY and add to uniqueness check
  arch/blackfin/mach-bf533/boards/stamp.c: add linux/delay.h
  ocfs2: fix the wrong directory passed to ocfs2_lookup_ino_from_name() when link file
  MAINTAINERS: update rydberg's addresses
  mm: protect set_page_dirty() from ongoing truncation
  mm: prevent endless growth of anon_vma hierarchy
  exit: fix race between wait_consider_task() and wait_task_zombie()
  ocfs2: remove bogus check in dlm_process_recovery_data
parents 11c8f01b 9e5e3661

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

James Bottomley <jejb@mulgrave.(none)>

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -724,15 +724,15 @@ F: include/uapi/linux/apm_bios.h 
F:	drivers/char/apm-emulation.c



APPLE BCM5974 MULTITOUCH DRIVER

M:	Henrik Rydberg <rydberg@euromail.se>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	linux-input@vger.kernel.org

S:	Maintained

S:	Odd fixes

F:	drivers/input/mouse/bcm5974.c



APPLE SMC DRIVER

M:	Henrik Rydberg <rydberg@euromail.se>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	lm-sensors@lm-sensors.org

S:	Maintained

S:	Odd fixes

F:	drivers/hwmon/applesmc.c



APPLETALK NETWORK LAYER
@@ -4940,10 +4940,10 @@ F: include/uapi/linux/input.h 
F:	include/linux/input/



INPUT MULTITOUCH (MT) PROTOCOL

M:	Henrik Rydberg <rydberg@euromail.se>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	linux-input@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git

S:	Maintained

S:	Odd fixes

F:	Documentation/input/multi-touch-protocol.txt

F:	drivers/input/input-mt.c

K:	\b(ABS|SYN)_MT_

arch/blackfin/mach-bf533/boards/stamp.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



#include <linux/device.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

fs/fcntl.c

+3 −2
Original line number Diff line number Diff line
@@ -740,14 +740,15 @@ static int __init fcntl_init(void) 
	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY

	 * is defined as O_NONBLOCK on some platforms and not on others.

	 */

	BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(

	BUILD_BUG_ON(21 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(

		O_RDONLY	| O_WRONLY	| O_RDWR	|

		O_CREAT		| O_EXCL	| O_NOCTTY	|

		O_TRUNC		| O_APPEND	| /* O_NONBLOCK	| */

		__O_SYNC	| O_DSYNC	| FASYNC	|

		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|

		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|

		__FMODE_EXEC	| O_PATH	| __O_TMPFILE

		__FMODE_EXEC	| O_PATH	| __O_TMPFILE	|

		__FMODE_NONOTIFY

		));



	fasync_cache = kmem_cache_create("fasync_cache",

fs/ocfs2/dlm/dlmrecovery.c

+1 −4
Original line number Diff line number Diff line
@@ -2023,11 +2023,8 @@ static int dlm_process_recovery_data(struct dlm_ctxt *dlm, 
	dlm_lockres_drop_inflight_ref(dlm, res);

	spin_unlock(&res->spinlock);



	if (ret < 0) {

	if (ret < 0)

		mlog_errno(ret);

		if (newlock)

			dlm_lock_put(newlock);

	}



	return ret;

}