Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index d67ab83823ad..79591c3660cc 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -243,12 +243,10 @@ static inline int block_page_mkwrite_return(int err)
 {
         if (err == 0)
                 return VM_FAULT_LOCKED;
-        if (err == -EFAULT)
+        if (err == -EFAULT || err == -EAGAIN)
                 return VM_FAULT_NOPAGE;
         if (err == -ENOMEM)
                 return VM_FAULT_OOM;
-        if (err == -EAGAIN)
-                return VM_FAULT_RETRY;
         /* -ENOSPC, -EDQUOT, -EIO ... */
         return VM_FAULT_SIGBUS;
 }