Merge tag 'v4.12-rc5' into for-4.13/block

We've already got a few conflicts and upcoming work depends on some of the changes that have gone into mainline as regression fixes for this series. Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream trees to continue working on 4.13 changes.

Jens Axboe committed 9 years ago

Commit 8f664392 parents 22ec656 32c1431742 files · +6992 −3899Browse files

Showing the changes to include/uapi/linux (1 of 742 files). Show all

Unified · Split

include/uapi/linux/keyctl.h+2−2

@@ -70,8 +70,8 @@ struct keyctl_dh_params { · 69 unmodified lines
70	70	};
71	71
72	72	struct keyctl_kdf_params {
73		− char *hashname;
74		− char *otherinfo;
	73	+ char __user *hashname;
	74	+ char __user *otherinfo;
75	75	__u32 otherinfolen;
76	76	__u32 __spare[8];
77	77	};