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.
Showing the changes to include/uapi/linux (1 of 742 files). Show all
Unified · Split
| @@ -70,8 +70,8 @@ struct keyctl_dh_params { · 69 unmodified lines | |||
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| 72 | struct keyctl_kdf_params { | 72 | struct keyctl_kdf_params { |
| 73 | char *hashname; | 73 | char __user *hashname; |
| 74 | char *otherinfo; | 74 | char __user *otherinfo; |
| 75 | __u32 otherinfolen; | 75 | __u32 otherinfolen; |
| 76 | __u32 __spare[8]; | 76 | __u32 __spare[8]; |
| 77 | }; | 77 | }; |