BackMerge tag 'v4.12-rc5' into drm-next

Linux 4.12-rc5 for nouveau fixes
2017-06-16 13:58:27 +10:00
parent a682169891 32c1431eea
commit 925344ccc9
618 changed files with 5571 additions and 3351 deletions
@@ -70,8 +70,8 @@ struct keyctl_dh_params {
 };

 struct keyctl_kdf_params {
-	char *hashname;
-	char *otherinfo;
+	char __user *hashname;
+	char __user *otherinfo;
 	__u32 otherinfolen;
 	__u32 __spare[8];
 };