From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2015 18:31:29 +0000 (-0800)
Subject: Merge tag 'locks-v4.4-1' of git://git.samba.org/jlayton/linux
X-Git-Tag: firefly_0821_release~176^2~799
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9576c2f2934eb5839a468ae156418ef595d5fec6;p=firefly-linux-kernel-4.4.55.git

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

Pull file locking updates from Jeff Layton:
 "The largest series of changes is from Ben who offered up a set to add
  a new helper function for setting locks based on the type set in
  fl_flags.  Dmitry also send in a fix for a potential race that he
  found with KTSAN"

* tag 'locks-v4.4-1' of git://git.samba.org/jlayton/linux:
  locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait
  Move locks API users to locks_lock_inode_wait()
  locks: introduce locks_lock_inode_wait()
  locks: Use more file_inode and fix a comment
  fs: fix data races on inode->i_flctx
  locks: change tracepoint for generic_add_lease
---

9576c2f2934eb5839a468ae156418ef595d5fec6