From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Nov 2015 07:10:54 +0000 (-0800)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e3078af2c67730c479f1d183af5b367f5d95337;p=people%2Fms%2Flinux.git

Merge branch 'akpm' (patches from Andrew)

Merge patch-bomb from Andrew Morton:

 - inotify tweaks

 - some ocfs2 updates (many more are awaiting review)

 - various misc bits

 - kernel/watchdog.c updates

 - Some of mm.  I have a huge number of MM patches this time and quite a
   lot of it is quite difficult and much will be held over to next time.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (162 commits)
  selftests: vm: add tests for lock on fault
  mm: mlock: add mlock flags to enable VM_LOCKONFAULT usage
  mm: introduce VM_LOCKONFAULT
  mm: mlock: add new mlock system call
  mm: mlock: refactor mlock, munlock, and munlockall code
  kasan: always taint kernel on report
  mm, slub, kasan: enable user tracking by default with KASAN=y
  kasan: use IS_ALIGNED in memory_is_poisoned_8()
  kasan: Fix a type conversion error
  lib: test_kasan: add some testcases
  kasan: update reference to kasan prototype repo
  kasan: move KASAN_SANITIZE in arch/x86/boot/Makefile
  kasan: various fixes in documentation
  kasan: update log messages
  kasan: accurately determine the type of the bad access
  kasan: update reported bug types for kernel memory accesses
  kasan: update reported bug types for not user nor kernel memory accesses
  mm/kasan: prevent deadlock in kasan reporting
  mm/kasan: don't use kasan shadow pointer in generic functions
  mm/kasan: MODULE_VADDR is not available on all archs
  ...
---

2e3078af2c67730c479f1d183af5b367f5d95337
diff --cc fs/9p/vfs_file.c
index f23fd86697ea,6b747394f6f5..7bf835f85bc8
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@@ -231,7 -231,8 +231,8 @@@ out_unlock
  	if (res < 0 && fl->fl_type != F_UNLCK) {
  		fl_type = fl->fl_type;
  		fl->fl_type = F_UNLCK;
- 		res = locks_lock_file_wait(filp, fl);
+ 		/* Even if this fails we want to return the remote error */
 -		posix_lock_file_wait(filp, fl);
++		locks_lock_file_wait(filp, fl);
  		fl->fl_type = fl_type;
  	}
  out: