From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Apr 2015 21:22:45 +0000 (-0700)
Subject: Merge tag 'locks-v4.1-1' of git://git.samba.org/jlayton/linux
X-Git-Tag: v4.1-rc1~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d50ff91d9780263160262daeb6adfdda8ddbc6c;p=platform%2Fkernel%2Flinux-exynos.git

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

Pull file locking related changes from Jeff Layton:
 "This set is mostly minor cleanups to the overhaul that went in last
  cycle.  The other noticeable items are the changes to the lm_get_owner
  and lm_put_owner prototypes, and the fact that we no longer need to
  use the i_lock to protect the i_flctx pointer"

* tag 'locks-v4.1-1' of git://git.samba.org/jlayton/linux:
  locks: use cmpxchg to assign i_flctx pointer
  locks: get rid of WE_CAN_BREAK_LSLK_NOW dead code
  locks: change lm_get_owner and lm_put_owner prototypes
  locks: don't allocate a lock context for an F_UNLCK request
  locks: Add lockdep assertion for blocked_lock_lock
  locks: remove extraneous IS_POSIX and IS_FLOCK tests
  locks: Remove unnecessary IS_POSIX test
---

6d50ff91d9780263160262daeb6adfdda8ddbc6c