diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-18 06:26:04 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-18 06:26:04 -1000 |
| commit | f83971912231fe5390d2357442b6c25bb8076d9b (patch) | |
| tree | 6c50d0f07b9fca3e000596159e496f02d86f2043 /drivers/ptp/Kconfig | |
| parent | 55ae1bd0d2fca3858fdc4bb86c1fc9b79650fe5b (diff) | |
| parent | 27ff6a0f7f5bf500e9d2a8760c062789b52c551f (diff) | |
Merge tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull gfs2 fixes from Steven Whitehouse:
"This patch set contains two minor docs/spelling fixes, some fixes for
flock, a change to use GFP_NOFS to avoid recursion on a rarely used
code path and a fix for a race relating to the glock lru"
* tag 'gfs2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes
GFS2: memcontrol: Spelling s/invlidate/invalidate/
GFS2: Allow caching of glocks for flock
GFS2: Allow flocks to use normal glock dq rather than dq_wait
GFS2: replace count*size kzalloc by kcalloc
GFS2: Use GFP_NOFS when allocating glocks
GFS2: Fix race in glock lru glock disposal
GFS2: Only wait for demote when last holder is dequeued
Diffstat (limited to 'drivers/ptp/Kconfig')
0 files changed, 0 insertions, 0 deletions