From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Jan 2016 23:46:17 +0000 (-0800)
Subject: Merge tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux
X-Git-Tag: Ubuntu-4.10.0-19.21~4177
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=065019a38feab5f2659cbd44080d528f8dff0b00;p=mirror_ubuntu-artful-kernel.git

Merge tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux

Pull file locking updates from Jeff Layton:
 "File locking related changes for v4.5 (pile #1)

  Highlights:
   - new Kconfig option to allow disabling mandatory locking (which is
     racy anyway)
   - new tracepoints for setlk and close codepaths
   - fix for a long-standing bug in code that handles races between
     setting a POSIX lock and close()"

* tag 'locks-v4.5-1' of git://git.samba.org/jlayton/linux:
  locks: rename __posix_lock_file to posix_lock_inode
  locks: prink more detail when there are leaked locks
  locks: pass inode pointer to locks_free_lock_context
  locks: sprinkle some tracepoints around the file locking code
  locks: don't check for race with close when setting OFD lock
  locks: fix unlock when fcntl_setlk races with a close
  fs: make locks.c explicitly non-modular
  locks: use list_first_entry_or_null()
  locks: Don't allow mounts in user namespaces to enable mandatory locking
  locks: Allow disabling mandatory locking at compile time
---

065019a38feab5f2659cbd44080d528f8dff0b00