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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (47 commits)
  ocfs2: Silence a gcc warning.
  ocfs2: Don't retry xattr set in case value extension fails.
  ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency break
  ocfs2: Reset xattr value size after xa_cleanup_value_truncate().
  fs/ocfs2/dlm: Use kstrdup
  fs/ocfs2/dlm: Drop memory allocation cast
  Ocfs2: Optimize punching-hole code.
  Ocfs2: Make ocfs2_find_cpos_for_left_leaf() public.
  Ocfs2: Fix hole punching to correctly do CoW during cluster zeroing.
  Ocfs2: Optimize ocfs2 truncate to use ocfs2_remove_btree_range() instead.
  ocfs2: Block signals for mkdir/link/symlink/O_CREAT.
  ocfs2: Wrap signal blocking in void functions.
  ocfs2/dlm: Increase o2dlm lockres hash size
  ocfs2: Make ocfs2_extend_trans() really extend.
  ocfs2/trivial: Code cleanup for allocation reservation.
  ocfs2: make ocfs2_adjust_resv_from_alloc simple.
  ocfs2: Make nointr a default mount option
  ocfs2/dlm: Make o2dlm domain join/leave messages KERN_NOTICE
  o2net: log socket state changes
  ocfs2: print node # when tcp fails
  ...

diff --cc fs/ocfs2/dlm/dlmast.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmconvert.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmmaster.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmthread.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmunlock.c
Simple merge

diff --cc fs/ocfs2/file.c
Simple merge

diff --cc fs/ocfs2/inode.c
Simple merge

diff --cc fs/ocfs2/inode.h
Simple merge

diff --cc fs/ocfs2/mmap.c
Simple merge

diff --cc fs/ocfs2/namei.c
Simple merge

diff --cc fs/ocfs2/quota_global.c
Simple merge

diff --cc fs/ocfs2/quota_local.c
Simple merge

diff --cc fs/ocfs2/refcounttree.c
Simple merge