I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Showing the changes to include/uapi/linux (1 of 234 files). Show all
Unified · Split
| @@ -65,7 +65,7 @@ · 64 unmodified lines | |||
| 65 | 65 | ||
| 66 | /* keyctl structures */ | 66 | /* keyctl structures */ |
| 67 | struct keyctl_dh_params { | 67 | struct keyctl_dh_params { |
| 68 | __s32 dh_private; | 68 | __s32 private; |
| 69 | __s32 prime; | 69 | __s32 prime; |
| 70 | __s32 base; | 70 | __s32 base; |
| 71 | }; | 71 | }; |