History

Merge 4.5-rc6 into usb-next

We want the USB fixes in here as well.

Greg Kroah-Hartman committed 10 years ago

Commit 71e41bb2 parents a057c32 fc77dbd537 files · +7314 −4374Browse files

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

Unified · Split

include/uapi/linux/ndctl.h+9−2
@@ -66,14 +66,18 @@ struct nd_cmd_ars_cap { · 65 unmodified lines
66 __u64 length;66 __u64 length;
67 __u32 status;67 __u32 status;
68 __u32 max_ars_out;68 __u32 max_ars_out;
69 __u32 clear_err_unit;
70 __u32 reserved;
69} __packed;71} __packed;
70 72
71struct nd_cmd_ars_start {73struct nd_cmd_ars_start {
72 __u64 address;74 __u64 address;
73 __u64 length;75 __u64 length;
74 __u16 type;76 __u16 type;
75 __u8 reserved[6];77 __u8 flags;
78 __u8 reserved[5];
76 __u32 status;79 __u32 status;
80 __u32 scrub_time;
77} __packed;81} __packed;
78 82
79struct nd_cmd_ars_status {83struct nd_cmd_ars_status {
@@ -81,11 +85,14 @@ struct nd_cmd_ars_status { · 1 unmodified line
81 __u32 out_length;85 __u32 out_length;
82 __u64 address;86 __u64 address;
83 __u64 length;87 __u64 length;
88 __u64 restart_address;
89 __u64 restart_length;
84 __u16 type;90 __u16 type;
91 __u16 flags;
85 __u32 num_records;92 __u32 num_records;
86 struct nd_ars_record {93 struct nd_ars_record {
87 __u32 handle;94 __u32 handle;
88 __u32 flags;95 __u32 reserved;
89 __u64 err_address;96 __u64 err_address;
90 __u64 length;97 __u64 length;
91 } __packed records[0];98 } __packed records[0];

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