From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 16 Jul 2015 18:05:38 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~325
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5cc4bb63271de22d61775614c101eae2f9828223;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek:
  ocfs2: call ocfs2_journal_access_di() before ocfs2_journal_dirty() in ocfs2_write_end_nolock()
  ocfs2: avoid access invalid address when read o2dlm debug messages
  ocfs2: make 'buffered' as the default coherency option
  ocfs2: Suppress the error message from being printed in ocfs2_rename
  ocfs2: Tighten free bit calculation in the global bitmap
  ocfs2/trivial: Limit unaligned aio+dio write messages to once per day
  ocfs2/trivial: Print message indicating unaligned aio+dio write
---

5cc4bb63271de22d61775614c101eae2f9828223