]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b703e4e d39e3ff)
Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 28 Aug 2015 17:56:22 +0000 (10:56 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 28 Aug 2015 17:56:22 +0000 (10:56 -0700)
* 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek:
  NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock

1  2 
fs/ocfs2/dlmglue.c patch | diff1 | diff2 | blob | history

diff --cc fs/ocfs2/dlmglue.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.