History

Merge 4.12-rc5 into staging-next

We want the IIO fixes and other staging driver fixes in here as well.

Greg Kroah-Hartman committed 9 years ago

Commit 7bf1e442 parents e5770b7 32c1431864 files · +9807 −5335Browse files

Showing the changes to include/uapi (1 of 864 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
72struct keyctl_kdf_params {72struct 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};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t