Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

Conflicts:
	include/linux/mm.h

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-mq-sysfs.c
Simple merge

diff --cc block/blk-mq.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/mm.h
index 6bb0b2b3ad0acefabd6798bc0d2235e15c49ac61,d6b51401028ecfb647846ce8581b7a53bd3c957b..fe22c056f118c68aa6d8f2313e2aa187ae7b6ff2
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -2069,7 -2035,7 +2069,8 @@@ static inline struct page *follow_page(
  #define FOLL_NUMA     0x200   /* force NUMA hinting page fault */
  #define FOLL_MIGRATION        0x400   /* wait for page to replace migration entry */
  #define FOLL_TRIED    0x800   /* a retry, previous pass started an IO */
+ #define FOLL_COW      0x4000  /* internal GUP flag */
 +#define FOLL_IMMED    0x08000000      /* fail if locking, or faulting pages in */
  
  typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
                        void *data);

diff --cc mm/gup.c
Simple merge