History

Merge branch 'patchwork' into topic/docs-next

* patchwork: (1492 commits) [media] cec: always check all_device_types and features [media] cec: poll should check if there is room in the tx queue [media] vivid: support monitor all mode [media] cec: fix test for unconfigured adapter in main message loop [media] cec: limit the size of the transmit queue [media] cec: zero unused msg part after msg->len [media] cec: don't set fh to NULL in CEC_TRANSMIT [media] cec: clear all status fields before transmit and always fill in sequence [media] cec: CEC_RECEIVE overwrote the timeout field [media] cxd2841er: Reading SNR for DVB-C added [media] cxd2841er: Reading BER and UCB for DVB-C added [media] cxd2841er: fix switch-case for DVB-C [media] cxd2841er: fix signal strength scale for ISDB-T [media] cxd2841er: adjust the dB scale for DVB-C [media] cxd2841er: provide signal strength for DVB-C [media] cxd2841er: fix BER report via DVBv5 stats API [media] mb86a20s: apply mask to val after checking for read failure [media] airspy: fix error logic during device register [media] s5p-cec/TODO: add TODO item [media] cec/TODO: drop comment about sphinx documentation ...

Mauro Carvalho Chehab committed 10 years ago

Commit c2782562 parents 7e5b7d1 009a6201510 files · +22254 −10419Browse files

Showing the changes to include/uapi (11 of 1510 files). Show all

Unified · Split

11 files
  1. include/uapi/linux/btrfs.h +1 −1
  2. include/uapi/linux/ethtool.h +10 −1
  3. include/uapi/linux/fuse.h +6 −1
  4. include/uapi/linux/gtp.h +1 −1
  5. include/uapi/linux/media.h +10 −0
  6. include/uapi/linux/netfilter/Kbuild +1 −0
  7. include/uapi/linux/netfilter/xt_SYNPROXY.h +2 −0
  8. include/uapi/linux/pkt_cls.h +3 −1
  9. include/uapi/linux/serio.h +1 −0
  10. include/uapi/linux/vsp1.h +0 −34
  11. include/uapi/sound/Kbuild +3 −0
include/uapi/linux/btrfs.h+1−1
@@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines
118 };118 };
119 union {119 union {
120 char name[BTRFS_SUBVOL_NAME_MAX + 1];120 char name[BTRFS_SUBVOL_NAME_MAX + 1];
121 u64 devid;121 __u64 devid;
122 };122 };
123};123};
124 124
include/uapi/linux/ethtool.h+10−1
@@ -1353,6 +1353,15 @@ enum ethtool_link_mode_bit_indices { · 1352 unmodified lines
1353 ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,1353 ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,
1354 ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,1354 ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
1355 ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,1355 ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
1356 ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,
1357 ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,
1358 ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,
1359 ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,
1360 ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT = 35,
1361 ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT = 36,
1362 ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT = 37,
1363 ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT = 38,
1364 ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT = 39,
1356 1365
1357 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit1366 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
1358 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*1367 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1361,7 +1370,7 @@ enum ethtool_link_mode_bit_indices { · 2 unmodified lines
1361 */1370 */
1362 1371
1363 __ETHTOOL_LINK_MODE_LAST1372 __ETHTOOL_LINK_MODE_LAST
1364 = ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT,1373 = ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,
1365};1374};
1366 1375
1367#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \1376#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
include/uapi/linux/fuse.h+6−1
@@ -105,6 +105,9 @@ · 104 unmodified lines
105 *105 *
106 * 7.24106 * 7.24
107 * - add FUSE_LSEEK for SEEK_HOLE and SEEK_DATA support107 * - add FUSE_LSEEK for SEEK_HOLE and SEEK_DATA support
108 *
109 * 7.25
110 * - add FUSE_PARALLEL_DIROPS
108 */111 */
109 112
110#ifndef _LINUX_FUSE_H113#ifndef _LINUX_FUSE_H
@@ -140,7 +143,7 @@ · 29 unmodified lines
140#define FUSE_KERNEL_VERSION 7143#define FUSE_KERNEL_VERSION 7
141 144
142/** Minor version number of this interface */145/** Minor version number of this interface */
143#define FUSE_KERNEL_MINOR_VERSION 24146#define FUSE_KERNEL_MINOR_VERSION 25
144 147
145/** The node ID of the root inode */148/** The node ID of the root inode */
146#define FUSE_ROOT_ID 1149#define FUSE_ROOT_ID 1
@@ -234,6 +237,7 @@ struct fuse_file_lock { · 87 unmodified lines
234 * FUSE_ASYNC_DIO: asynchronous direct I/O submission237 * FUSE_ASYNC_DIO: asynchronous direct I/O submission
235 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes238 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
236 * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens239 * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
240 * FUSE_PARALLEL_DIROPS: allow parallel lookups and readdir
237 */241 */
238#define FUSE_ASYNC_READ (1 << 0)242#define FUSE_ASYNC_READ (1 << 0)
239#define FUSE_POSIX_LOCKS (1 << 1)243#define FUSE_POSIX_LOCKS (1 << 1)
@@ -253,6 +257,7 @@ struct fuse_file_lock { · 13 unmodified lines
253#define FUSE_ASYNC_DIO (1 << 15)257#define FUSE_ASYNC_DIO (1 << 15)
254#define FUSE_WRITEBACK_CACHE (1 << 16)258#define FUSE_WRITEBACK_CACHE (1 << 16)
255#define FUSE_NO_OPEN_SUPPORT (1 << 17)259#define FUSE_NO_OPEN_SUPPORT (1 << 17)
260#define FUSE_PARALLEL_DIROPS (1 << 18)
256 261
257/**262/**
258 * CUSE INIT request/reply flags263 * CUSE INIT request/reply flags
include/uapi/linux/gtp.h+1−1
@@ -1,5 +1,5 @@
1#ifndef _UAPI_LINUX_GTP_H_1#ifndef _UAPI_LINUX_GTP_H_
2#define _UAPI_LINUX_GTP_H__2#define _UAPI_LINUX_GTP_H_
3 3
4enum gtp_genl_cmds {4enum gtp_genl_cmds {
5 GTP_CMD_NEWPDP,5 GTP_CMD_NEWPDP,
include/uapi/linux/media.h+10−0
@@ -94,6 +94,16 @@ struct media_device_info { · 93 unmodified lines
94#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 0x03002)94#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 0x03002)
95#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 0x03003)95#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 0x03003)
96 96
97/*
98 * Processing entities
99 */
100#define MEDIA_ENT_F_PROC_VIDEO_COMPOSER (MEDIA_ENT_F_BASE + 0x4001)
101#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER (MEDIA_ENT_F_BASE + 0x4002)
102#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV (MEDIA_ENT_F_BASE + 0x4003)
103#define MEDIA_ENT_F_PROC_VIDEO_LUT (MEDIA_ENT_F_BASE + 0x4004)
104#define MEDIA_ENT_F_PROC_VIDEO_SCALER (MEDIA_ENT_F_BASE + 0x4005)
105#define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006)
106
97/*107/*
98 * Connectors108 * Connectors
99 */109 */
include/uapi/linux/netfilter/Kbuild+1−0
@@ -33,6 +33,7 @@ header-y += xt_NFLOG.h · 32 unmodified lines
33header-y += xt_NFQUEUE.h33header-y += xt_NFQUEUE.h
34header-y += xt_RATEEST.h34header-y += xt_RATEEST.h
35header-y += xt_SECMARK.h35header-y += xt_SECMARK.h
36header-y += xt_SYNPROXY.h
36header-y += xt_TCPMSS.h37header-y += xt_TCPMSS.h
37header-y += xt_TCPOPTSTRIP.h38header-y += xt_TCPOPTSTRIP.h
38header-y += xt_TEE.h39header-y += xt_TEE.h
include/uapi/linux/netfilter/xt_SYNPROXY.h+2−0
@@ -1,6 +1,8 @@
1#ifndef _XT_SYNPROXY_H1#ifndef _XT_SYNPROXY_H
2#define _XT_SYNPROXY_H2#define _XT_SYNPROXY_H
3 3
4#include <linux/types.h>
5
4#define XT_SYNPROXY_OPT_MSS 0x016#define XT_SYNPROXY_OPT_MSS 0x01
5#define XT_SYNPROXY_OPT_WSCALE 0x027#define XT_SYNPROXY_OPT_WSCALE 0x02
6#define XT_SYNPROXY_OPT_SACK_PERM 0x048#define XT_SYNPROXY_OPT_SACK_PERM 0x04
include/uapi/linux/pkt_cls.h+3−1
@@ -145,6 +145,8 @@ enum { · 144 unmodified lines
145 TCA_POLICE_PEAKRATE,145 TCA_POLICE_PEAKRATE,
146 TCA_POLICE_AVRATE,146 TCA_POLICE_AVRATE,
147 TCA_POLICE_RESULT,147 TCA_POLICE_RESULT,
148 TCA_POLICE_TM,
149 TCA_POLICE_PAD,
148 __TCA_POLICE_MAX150 __TCA_POLICE_MAX
149#define TCA_POLICE_RESULT TCA_POLICE_RESULT151#define TCA_POLICE_RESULT TCA_POLICE_RESULT
150};152};
@@ -173,7 +175,7 @@ enum { · 22 unmodified lines
173 TCA_U32_DIVISOR,175 TCA_U32_DIVISOR,
174 TCA_U32_SEL,176 TCA_U32_SEL,
175 TCA_U32_POLICE,177 TCA_U32_POLICE,
176 TCA_U32_ACT, 178 TCA_U32_ACT,
177 TCA_U32_INDEV,179 TCA_U32_INDEV,
178 TCA_U32_PCNT,180 TCA_U32_PCNT,
179 TCA_U32_MARK,181 TCA_U32_MARK,
include/uapi/linux/serio.h+1−0
@@ -78,5 +78,6 @@ · 77 unmodified lines
78#define SERIO_TSC40 0x3d78#define SERIO_TSC40 0x3d
79#define SERIO_WACOM_IV 0x3e79#define SERIO_WACOM_IV 0x3e
80#define SERIO_EGALAX 0x3f80#define SERIO_EGALAX 0x3f
81#define SERIO_PULSE8_CEC 0x40
81 82
82#endif /* _UAPI_SERIO_H */83#endif /* _UAPI_SERIO_H */
include/uapi/linux/vsp1.h+0−34
@@ -1,34 +0,0 @@
1/*
2 * vsp1.h
3 *
4 * Renesas R-Car VSP1 - User-space API
5 *
6 * Copyright (C) 2013 Renesas Corporation
7 *
8 * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License version 2 as
12 * published by the Free Software Foundation.
13 */
14
15#ifndef __VSP1_USER_H__
16#define __VSP1_USER_H__
17
18#include <linux/types.h>
19#include <linux/videodev2.h>
20
21/*
22 * Private IOCTLs
23 *
24 * VIDIOC_VSP1_LUT_CONFIG - Configure the lookup table
25 */
26
27#define VIDIOC_VSP1_LUT_CONFIG \
28 _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct vsp1_lut_config)
29
30struct vsp1_lut_config {
31 __u32 lut[256];
32};
33
34#endif /* __VSP1_USER_H__ */
include/uapi/sound/Kbuild+3−0
@@ -1,5 +1,6 @@
1# UAPI Header export list1# UAPI Header export list
2header-y += asequencer.h2header-y += asequencer.h
3header-y += asoc.h
3header-y += asound.h4header-y += asound.h
4header-y += asound_fm.h5header-y += asound_fm.h
5header-y += compress_offload.h6header-y += compress_offload.h
@@ -10,3 +11,5 @@ header-y += hdsp.h · 4 unmodified lines
10header-y += hdspm.h11header-y += hdspm.h
11header-y += sb16_csp.h12header-y += sb16_csp.h
12header-y += sfnt_info.h13header-y += sfnt_info.h
14header-y += tlv.h
15header-y += usb_stream.h

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