diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-25 12:40:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-25 12:40:32 -0700 |
| commit | 625bba662c17e917e164dc37f61aebbc49987ed6 (patch) | |
| tree | d8a373269a58197e45b932f65b41044390b0071a /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | b8e6dece3746902c29a4f0007c062641fa5dcc2d (diff) | |
| parent | cff2fce58b2b0f59089e7edcdc38803d65057b9f (diff) | |
| download | linux-625bba662c17e917e164dc37f61aebbc49987ed6.tar.gz linux-625bba662c17e917e164dc37f61aebbc49987ed6.tar.bz2 linux-625bba662c17e917e164dc37f61aebbc49987ed6.zip | |
Merge tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux
Pull file locking fixes from Jeff Layton:
"File locking related bugfixes for v3.15 (pile #2)
- fix for a long-standing bug in __break_lease that can cause soft
lockups
- renaming of file-private locks to "open file description" locks,
and the command macros to more visually distinct names
The fix for __break_lease is also in the pile of patches for which
Bruce sent a pull request, but I assume that your merge procedure will
handle that correctly.
For the other patches, I don't like the fact that we need to rename
this stuff at this late stage, but it should be settled now
(hopefully)"
* tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux:
locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
locks: rename file-private locks to "open file description locks"
locks: allow __break_lease to sleep even when break_time is 0
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
0 files changed, 0 insertions, 0 deletions