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
6666 __u64 length;
6767 __u32 status;
6868 __u32 max_ars_out;
69+ __u32 clear_err_unit;
70+ __u32 reserved;
6971 } __packed;
7072
7173 struct nd_cmd_ars_start {
7274 __u64 address;
7375 __u64 length;
7476 __u16 type;
75− __u8 reserved[6];
77+ __u8 flags;
78+ __u8 reserved[5];
7679 __u32 status;
80+ __u32 scrub_time;
7781 } __packed;
7882
7983 struct nd_cmd_ars_status {
@@ -81,11 +85,14 @@ struct nd_cmd_ars_status { · 1 unmodified line
8185 __u32 out_length;
8286 __u64 address;
8387 __u64 length;
88+ __u64 restart_address;
89+ __u64 restart_length;
8490 __u16 type;
91+ __u16 flags;
8592 __u32 num_records;
8693 struct nd_ars_record {
8794 __u32 handle;
88− __u32 flags;
95+ __u32 reserved;
8996 __u64 err_address;
9097 __u64 length;
9198 } __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