From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Thu, 20 Oct 2016 23:53:37 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux... 
X-Git-Tag: v4.1.12-92~62
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=081a8de7694846406937a92397ff5e476d4c1714;p=users%2Fjedix%2Flinux-maple.git

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

Conflicts:
	include/linux/mm.h
---

081a8de7694846406937a92397ff5e476d4c1714
diff --cc include/linux/mm.h
index 6bb0b2b3ad0ac,d6b51401028ec..fe22c056f118c
--- a/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);