]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'topic/uek-4.1/ocfs2' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:05:38 +0000 (11:05 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:05:38 +0000 (11:05 -0700)
commit5cc4bb63271de22d61775614c101eae2f9828223
tree9fdf681a040119aee7575529db3298efbfda3e3a
parentc9b782cabf18756f3e352f42fe89ebe7717c4bee
parentcaecbc256276a862bf97b52be42d3a2a4b78365d
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