History

Merge 4.5-rc4 into usb-next

We want the USB fixes in here as well.

Greg Kroah-Hartman committed 10 years ago

Commit 172ad9a2 parents a44007a 18558ca735 files · +6588 −56897Browse files

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

Unified · Split

include/uapi/linux/fs.h+0−1
@@ -222,7 +222,6 @@ struct fsxattr { · 221 unmodified lines
222#define BLKSECDISCARD _IO(0x12,125)222#define BLKSECDISCARD _IO(0x12,125)
223#define BLKROTATIONAL _IO(0x12,126)223#define BLKROTATIONAL _IO(0x12,126)
224#define BLKZEROOUT _IO(0x12,127)224#define BLKZEROOUT _IO(0x12,127)
225#define BLKDAXSET _IO(0x12,128)
226#define BLKDAXGET _IO(0x12,129)225#define BLKDAXGET _IO(0x12,129)
227 226
228#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */227#define BMAP_IOCTL 1 /* obsolete - kept for compatibility */

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