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

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

* 'topic/uek-4.1/oracleasm' of git://ca-git.us.oracle.com/linux-uek:
  oracleasm: Fix trace output for warn_asm_ioc and check_asm_ioc
  oracleasm: Fix occasional I/O stall due to merge error
  oracleasm: Classify device connectivity issues as global errors
  oracleasm: Deprecate mlog and implement support for tracepoints
  oracleasm: Abolish mlog usage in integrity.c and clean up error printing.
  oracleasm: Various code and whitespace cleanups.
  oracleasm: 4.0 compat changes
  oracleasm: Compat changes for 3.18
  oracleasm: claim FMODE_EXCL access on disk during asm_open
  oracleasm: Restrict logical block size reporting
  oracleasm: Report logical block size
  oracleasm: Compat changes for 3.10
  oracleasm: Add support for new error return codes from block/SCSI
  oracleasm: Compat changes for 3.8
  oracleasm: Compat changes for 3.5
  oracleasm: Introduce module parameter for block size selection
  oracleasm: Data integrity support
  oracleasm: Fix two merge errors
  Oracle ASM Kernel Driver