Merge branch 'linus' into efi/core, to pick up fixes

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2016-11-13 08:16:40 +01:00
commit 74239ac259
1133 changed files with 12574 additions and 7544 deletions

View file

@ -686,8 +686,8 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
if (!pages)
return -ENOMEM;
ret = get_user_pages_unlocked((unsigned long)buf, nr_pages, WRITE,
0, pages);
ret = get_user_pages_unlocked((unsigned long)buf, nr_pages, pages,
FOLL_WRITE);
if (ret < nr_pages) {
nr_pages = ret;