linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-28 00:19:30 +00:00

History

Linus Torvalds a30bfd6cd4 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  O2net: Disallow o2net accept connection request from itself.
  ocfs2/dlm: remove potential deadlock -V3
  ocfs2/dlm: avoid incorrect bit set in refmap on recovery master
  Fix the nested PR lock calling issue in ACL
  ocfs2: Count more refcount records in file system fragmentation.
  ocfs2 fix o2dlm dlm run purgelist (rev 3)
  ocfs2/dlm: fix a dead lock
  ocfs2: do not overwrite error codes in ocfs2_init_acl

2010-08-13 10:43:50 -07:00

dlmapi.h

ocfs2/trivial: Remove trailing whitespaces

2010-01-25 19:20:51 -08:00

dlmast.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2010-05-21 07:20:17 -07:00

dlmcommon.h

ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency break

2010-05-18 16:41:34 -07:00

dlmconvert.c

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2