History

Merge 3.14-rc3 into char-misc-next

We need the fixes here for future mei and other patches.

Greg Kroah-Hartman committed 12 years ago

Commit ba4b60e2 parents 5dba4c5 6d0abec733 files · +9322 −4072Browse files

Showing the changes to include/uapi/linux (4 of 733 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/btrfs.h +0 −1
  2. include/uapi/linux/in6.h +7 −16
  3. include/uapi/linux/mic_ioctl.h +1 −1
  4. include/uapi/linux/nvme.h +11 −0
include/uapi/linux/btrfs.h+0−1
@@ -558,7 +558,6 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code) · 557 unmodified lines
558558 #define BTRFS_IOC_DEFAULT_SUBVOL _IOW(BTRFS_IOCTL_MAGIC, 19, __u64)
559559 #define BTRFS_IOC_SPACE_INFO _IOWR(BTRFS_IOCTL_MAGIC, 20, \
560560 struct btrfs_ioctl_space_args)
561−#define BTRFS_IOC_GLOBAL_RSV _IOR(BTRFS_IOCTL_MAGIC, 20, __u64)
562561 #define BTRFS_IOC_START_SYNC _IOR(BTRFS_IOCTL_MAGIC, 24, __u64)
563562 #define BTRFS_IOC_WAIT_SYNC _IOW(BTRFS_IOCTL_MAGIC, 22, __u64)
564563 #define BTRFS_IOC_SNAP_CREATE_V2 _IOW(BTRFS_IOCTL_MAGIC, 23, \
include/uapi/linux/in6.h+7−16
@@ -128,22 +128,13 @@ struct in6_flowlabel_req { · 127 unmodified lines
128128 * IPV6 extension headers
129129 */
130130 #if __UAPI_DEF_IPPROTO_V6
131−enum {
132− IPPROTO_HOPOPTS = 0, /* IPv6 hop-by-hop options */
133−#define IPPROTO_HOPOPTS IPPROTO_HOPOPTS
134− IPPROTO_ROUTING = 43, /* IPv6 routing header */
135−#define IPPROTO_ROUTING IPPROTO_ROUTING
136− IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header */
137−#define IPPROTO_FRAGMENT IPPROTO_FRAGMENT
138− IPPROTO_ICMPV6 = 58, /* ICMPv6 */
139−#define IPPROTO_ICMPV6 IPPROTO_ICMPV6
140− IPPROTO_NONE = 59, /* IPv6 no next header */
141−#define IPPROTO_NONE IPPROTO_NONE
142− IPPROTO_DSTOPTS = 60, /* IPv6 destination options */
143−#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS
144− IPPROTO_MH = 135, /* IPv6 mobility header */
145−#define IPPROTO_MH IPPROTO_MH
146−};
131+#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */
132+#define IPPROTO_ROUTING 43 /* IPv6 routing header */
133+#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */
134+#define IPPROTO_ICMPV6 58 /* ICMPv6 */
135+#define IPPROTO_NONE 59 /* IPv6 no next header */
136+#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */
137+#define IPPROTO_MH 135 /* IPv6 mobility header */
147138 #endif /* __UAPI_DEF_IPPROTO_V6 */
148139
149140 /*
include/uapi/linux/mic_ioctl.h+1−1
@@ -39,7 +39,7 @@ struct mic_copy_desc { · 38 unmodified lines
3939 #else
4040 struct iovec *iov;
4141 #endif
42− int iovcnt;
42+ __u32 iovcnt;
4343 __u8 vr_idx;
4444 __u8 update_used;
4545 __u32 out_len;
include/uapi/linux/nvme.h+11−0
@@ -350,6 +350,16 @@ struct nvme_delete_queue { · 349 unmodified lines
350350 __u32 rsvd11[5];
351351 };
352352
353+struct nvme_abort_cmd {
354+ __u8 opcode;
355+ __u8 flags;
356+ __u16 command_id;
357+ __u32 rsvd1[9];
358+ __le16 sqid;
359+ __u16 cid;
360+ __u32 rsvd11[5];
361+};
362+
353363 struct nvme_download_firmware {
354364 __u8 opcode;
355365 __u8 flags;
@@ -384,6 +394,7 @@ struct nvme_command { · 28 unmodified lines
384394 struct nvme_download_firmware dlfw;
385395 struct nvme_format_cmd format;
386396 struct nvme_dsm_cmd dsm;
397+ struct nvme_abort_cmd abort;
387398 };
388399 };
389400