• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 498f7f50
    Linus Torvalds authored
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits)
      MAINTAINERS: Update Joel Becker's email address
      ocfs2: Remove unused truncate function from alloc.c
      ocfs2/cluster: dereferencing before checking in nst_seq_show()
      ocfs2: fix build for OCFS2_FS_STATS not enabled
      ocfs2/cluster: Show o2net timing statistics
      ocfs2/cluster: Track process message timing stats for each socket
      ocfs2/cluster: Track send message timing stats for each socket
      ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container
      ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
      ocfs2: Add DEBUG_FS dependency
      ocfs2/dlm: Hard code the values for enums
      ocfs2/dlm: Minor cleanup
      ocfs2/dlm: Cleanup dlmdebug.c
      ocfs2: Release buffer_head in case of error in ocfs2_double_lock.
      ocfs2/cluster: Pin the local node when o2hb thread starts
      ocfs2/cluster: Show pin state for each o2hb region
      ocfs2/cluster: Pin/unpin o2hb regions
      ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap
      ocfs2/cluster: Pin the remote node item in configfs
      ocfs2/dlm: make existing convertion precedent over new lock
      ...
    498f7f50
MAINTAINERS 184 KB