From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 25 Sep 2015 16:49:08 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/aio-dio' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~272
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4ed29659b9395cb88e8c7d745442e75ecf2de263;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/aio-dio' of git://ca-git.us.oracle.com/linux-uek:
  block: loop: don't enable direct-io unless the filesystem supports it
  block: loop: Enable directIO on nfs
  block: loop: Enable directIO whenever possible
  block: loop: support DIO & AIO
  block: loop: prepare for supporing direct IO
  block: loop: use kthread_work
  block: loop: set QUEUE_FLAG_NOMERGES for request queue of loop
  fs: direct-io: don't dirtying pages for ITER_BVEC/ITER_KVEC direct read
  nfs: don't dirty kernel pages read by direct-io
  block: loop: avoiding too many pending per work I/O
  block: loop: convert to per-device workqueue

Conflicts:
	drivers/block/loop.c
---

4ed29659b9395cb88e8c7d745442e75ecf2de263