History

Merge tag 'asoc-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Final updates for v3.13 A few final updates for v3.13, all driver updates apart from some DPCM and Coverity fixes which should have minor impact on practical systems.

Takashi Iwai committed 13 years ago

Commit ebfe1062 parents 0238385 71d0c3a280 files · +2457 −1239Browse files

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

Unified · Split

4 files
  1. include/uapi/drm/drm_mode.h +2 −0
  2. include/uapi/linux/tc_act/Kbuild +1 −0
  3. include/uapi/linux/tc_act/tc_defact.h +19 −0
  4. include/uapi/rdma/ib_user_verbs.h +6 −0
include/uapi/drm/drm_mode.h+2−0
@@ -223,6 +223,8 @@ struct drm_mode_get_connector { · 222 unmodified lines
223 __u32 connection;223 __u32 connection;
224 __u32 mm_width, mm_height; /**< HxW in millimeters */224 __u32 mm_width, mm_height; /**< HxW in millimeters */
225 __u32 subpixel;225 __u32 subpixel;
226
227 __u32 pad;
226};228};
227 229
228#define DRM_MODE_PROP_PENDING (1<<0)230#define DRM_MODE_PROP_PENDING (1<<0)
include/uapi/linux/tc_act/Kbuild+1−0
@@ -1,5 +1,6 @@
1# UAPI Header export list1# UAPI Header export list
2header-y += tc_csum.h2header-y += tc_csum.h
3header-y += tc_defact.h
3header-y += tc_gact.h4header-y += tc_gact.h
4header-y += tc_ipt.h5header-y += tc_ipt.h
5header-y += tc_mirred.h6header-y += tc_mirred.h
include/uapi/linux/tc_act/tc_defact.h+19−0
@@ -0,0 +1,19 @@
1#ifndef __LINUX_TC_DEF_H
2#define __LINUX_TC_DEF_H
3
4#include <linux/pkt_cls.h>
5
6struct tc_defact {
7 tc_gen;
8};
9
10enum {
11 TCA_DEF_UNSPEC,
12 TCA_DEF_TM,
13 TCA_DEF_PARMS,
14 TCA_DEF_DATA,
15 __TCA_DEF_MAX
16};
17#define TCA_DEF_MAX (__TCA_DEF_MAX - 1)
18
19#endif
include/uapi/rdma/ib_user_verbs.h+6−0
@@ -87,8 +87,10 @@ enum { · 86 unmodified lines
87 IB_USER_VERBS_CMD_CLOSE_XRCD,87 IB_USER_VERBS_CMD_CLOSE_XRCD,
88 IB_USER_VERBS_CMD_CREATE_XSRQ,88 IB_USER_VERBS_CMD_CREATE_XSRQ,
89 IB_USER_VERBS_CMD_OPEN_QP,89 IB_USER_VERBS_CMD_OPEN_QP,
90#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
90 IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,91 IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
91 IB_USER_VERBS_CMD_DESTROY_FLOW92 IB_USER_VERBS_CMD_DESTROY_FLOW
93#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
92};94};
93 95
94/*96/*
@@ -126,6 +128,7 @@ struct ib_uverbs_cmd_hdr { · 31 unmodified lines
126 __u16 out_words;128 __u16 out_words;
127};129};
128 130
131#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
129struct ib_uverbs_cmd_hdr_ex {132struct ib_uverbs_cmd_hdr_ex {
130 __u32 command;133 __u32 command;
131 __u16 in_words;134 __u16 in_words;
@@ -134,6 +137,7 @@ struct ib_uverbs_cmd_hdr_ex { · 2 unmodified lines
134 __u16 provider_out_words;137 __u16 provider_out_words;
135 __u32 cmd_hdr_reserved;138 __u32 cmd_hdr_reserved;
136};139};
140#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
137 141
138struct ib_uverbs_get_context {142struct ib_uverbs_get_context {
139 __u64 response;143 __u64 response;
@@ -696,6 +700,7 @@ struct ib_uverbs_detach_mcast { · 556 unmodified lines
696 __u64 driver_data[0];700 __u64 driver_data[0];
697};701};
698 702
703#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
699struct ib_kern_eth_filter {704struct ib_kern_eth_filter {
700 __u8 dst_mac[6];705 __u8 dst_mac[6];
701 __u8 src_mac[6];706 __u8 src_mac[6];
@@ -780,6 +785,7 @@ struct ib_uverbs_destroy_flow { · 78 unmodified lines
780 __u32 comp_mask;785 __u32 comp_mask;
781 __u32 flow_handle;786 __u32 flow_handle;
782};787};
788#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
783 789
784struct ib_uverbs_create_srq {790struct ib_uverbs_create_srq {
785 __u64 response;791 __u64 response;

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