History

BackMerge v4.19-rc6 into drm-next

I have some pulls based on rc6, and I prefer to have an explicit backmerge.

Dave Airlie committed 8 years ago

Commit 6004f172 parents 612c6bd 17b57b1234 files · +1707 −1256Browse files

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

Unified · Split

include/uapi/linux/keyctl.h+1−1
@@ -65,7 +65,7 @@ · 64 unmodified lines
6565
6666 /* keyctl structures */
6767 struct keyctl_dh_params {
68− __s32 dh_private;
68+ __s32 private;
6969 __s32 prime;
7070 __s32 base;
7171 };