| commit | 14186fea0cb06bc43181ce239efe0df6f1af260a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 13 11:33:09 2014 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 13 11:33:09 2014 +0900 |
| tree | 4c58c5747529b74502352b185515af43e26c0666 | |
| parent | 77d92784b46549e00f7b99794cd566045ded62ba [diff] | |
| parent | cf01f4eef9fe367ec0d85b38dd7214e29e376cdb [diff] |
Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux Pull file locking fix from Jeff Layton: "Fix for regression in handling of F_GETLK commands" * tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux: locks: only validate the lock vs. f_mode in F_SETLK codepaths