History

Merge tag 'v4.7-rc6' into patchwork

Linux 4.7-rc6 * tag 'v4.7-rc6': (1245 commits) Linux 4.7-rc6 ovl: warn instead of error if d_type is not supported MIPS: Fix possible corruption of cache mode by mprotect. locks: use file_inode() usb: dwc3: st: Use explicit reset_control_get_exclusive() API phy: phy-stih407-usb: Use explicit reset_control_get_exclusive() API phy: miphy28lp: Inform the reset framework that our reset line may be shared namespace: update event counter when umounting a deleted dentry 9p: use file_dentry() lockd: unregister notifier blocks if the service fails to come up completely ACPI,PCI,IRQ: correct operator precedence fuse: serialize dirops by default drm/i915: Fix missing unlock on error in i915_ppgtt_info() powerpc: Initialise pci_io_base as early as possible mfd: da9053: Fix compiler warning message for uninitialised variable mfd: max77620: Fix FPS switch statements phy: phy-stih407-usb: Inform the reset framework that our reset line may be shared usb: dwc3: st: Inform the reset framework that our reset line may be shared usb: host: ehci-st: Inform the reset framework that our reset line may be shared usb: host: ohci-st: Inform the reset framework that our reset line may be shared ...

Mauro Carvalho Chehab committed 10 years ago

Commit fb810cb2 parents 241d9bb a99cde41201 files · +11902 −7327Browse files

Showing the changes to include/uapi (10 of 1201 files). Show all

Unified · Split

10 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/input-event-codes.h +31 −0
  6. include/uapi/linux/input.h +1 −0
  7. include/uapi/linux/netfilter/Kbuild +1 −0
  8. include/uapi/linux/netfilter/xt_SYNPROXY.h +2 −0
  9. include/uapi/linux/pkt_cls.h +3 −1
  10. 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
118118 };
119119 union {
120120 char name[BTRFS_SUBVOL_NAME_MAX + 1];
121− u64 devid;
121+ __u64 devid;
122122 };
123123 };
124124
include/uapi/linux/ethtool.h+10−1
@@ -1353,6 +1353,15 @@ enum ethtool_link_mode_bit_indices { · 1352 unmodified lines
13531353 ETHTOOL_LINK_MODE_56000baseCR4_Full_BIT = 28,
13541354 ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
13551355 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,
13561365
13571366 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
13581367 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
@@ -1361,7 +1370,7 @@ enum ethtool_link_mode_bit_indices { · 2 unmodified lines
13611370 */
13621371
13631372 __ETHTOOL_LINK_MODE_LAST
1364− = ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT,
1373+ = ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,
13651374 };
13661375
13671376 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
include/uapi/linux/fuse.h+6−1
@@ -105,6 +105,9 @@ · 104 unmodified lines
105105 *
106106 * 7.24
107107 * - add FUSE_LSEEK for SEEK_HOLE and SEEK_DATA support
108+ *
109+ * 7.25
110+ * - add FUSE_PARALLEL_DIROPS
108111 */
109112
110113 #ifndef _LINUX_FUSE_H
@@ -140,7 +143,7 @@ · 29 unmodified lines
140143 #define FUSE_KERNEL_VERSION 7
141144
142145 /** Minor version number of this interface */
143−#define FUSE_KERNEL_MINOR_VERSION 24
146+#define FUSE_KERNEL_MINOR_VERSION 25
144147
145148 /** The node ID of the root inode */
146149 #define FUSE_ROOT_ID 1
@@ -234,6 +237,7 @@ struct fuse_file_lock { · 87 unmodified lines
234237 * FUSE_ASYNC_DIO: asynchronous direct I/O submission
235238 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
236239 * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
240+ * FUSE_PARALLEL_DIROPS: allow parallel lookups and readdir
237241 */
238242 #define FUSE_ASYNC_READ (1 << 0)
239243 #define FUSE_POSIX_LOCKS (1 << 1)
@@ -253,6 +257,7 @@ struct fuse_file_lock { · 13 unmodified lines
253257 #define FUSE_ASYNC_DIO (1 << 15)
254258 #define FUSE_WRITEBACK_CACHE (1 << 16)
255259 #define FUSE_NO_OPEN_SUPPORT (1 << 17)
260+#define FUSE_PARALLEL_DIROPS (1 << 18)
256261
257262 /**
258263 * CUSE INIT request/reply flags
include/uapi/linux/gtp.h+1−1
@@ -1,5 +1,5 @@
11 #ifndef _UAPI_LINUX_GTP_H_
2−#define _UAPI_LINUX_GTP_H__
2+#define _UAPI_LINUX_GTP_H_
33
44 enum gtp_genl_cmds {
55 GTP_CMD_NEWPDP,
include/uapi/linux/input-event-codes.h+31−0
@@ -611,6 +611,37 @@ · 610 unmodified lines
611611 #define KEY_KBDINPUTASSIST_ACCEPT 0x264
612612 #define KEY_KBDINPUTASSIST_CANCEL 0x265
613613
614+/* Diagonal movement keys */
615+#define KEY_RIGHT_UP 0x266
616+#define KEY_RIGHT_DOWN 0x267
617+#define KEY_LEFT_UP 0x268
618+#define KEY_LEFT_DOWN 0x269
619+
620+#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */
621+/* Show Top Menu of the Media (e.g. DVD) */
622+#define KEY_MEDIA_TOP_MENU 0x26b
623+#define KEY_NUMERIC_11 0x26c
624+#define KEY_NUMERIC_12 0x26d
625+/*
626+ * Toggle Audio Description: refers to an audio service that helps blind and
627+ * visually impaired consumers understand the action in a program. Note: in
628+ * some countries this is referred to as "Video Description".
629+ */
630+#define KEY_AUDIO_DESC 0x26e
631+#define KEY_3D_MODE 0x26f
632+#define KEY_NEXT_FAVORITE 0x270
633+#define KEY_STOP_RECORD 0x271
634+#define KEY_PAUSE_RECORD 0x272
635+#define KEY_VOD 0x273 /* Video on Demand */
636+#define KEY_UNMUTE 0x274
637+#define KEY_FASTREVERSE 0x275
638+#define KEY_SLOWREVERSE 0x276
639+/*
640+ * Control a data application associated with the currently viewed channel,
641+ * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
642+ */
643+#define KEY_DATA 0x275
644+
614645 #define BTN_TRIGGER_HAPPY 0x2c0
615646 #define BTN_TRIGGER_HAPPY1 0x2c0
616647 #define BTN_TRIGGER_HAPPY2 0x2c1
include/uapi/linux/input.h+1−0
@@ -247,6 +247,7 @@ struct input_mask { · 246 unmodified lines
247247 #define BUS_ATARI 0x1B
248248 #define BUS_SPI 0x1C
249249 #define BUS_RMI 0x1D
250+#define BUS_CEC 0x1E
250251
251252 /*
252253 * MT_TOOL types
include/uapi/linux/netfilter/Kbuild+1−0
@@ -33,6 +33,7 @@ header-y += xt_NFLOG.h · 32 unmodified lines
3333 header-y += xt_NFQUEUE.h
3434 header-y += xt_RATEEST.h
3535 header-y += xt_SECMARK.h
36+header-y += xt_SYNPROXY.h
3637 header-y += xt_TCPMSS.h
3738 header-y += xt_TCPOPTSTRIP.h
3839 header-y += xt_TEE.h
include/uapi/linux/netfilter/xt_SYNPROXY.h+2−0
@@ -1,6 +1,8 @@
11 #ifndef _XT_SYNPROXY_H
22 #define _XT_SYNPROXY_H
33
4+#include <linux/types.h>
5+
46 #define XT_SYNPROXY_OPT_MSS 0x01
57 #define XT_SYNPROXY_OPT_WSCALE 0x02
68 #define XT_SYNPROXY_OPT_SACK_PERM 0x04
include/uapi/linux/pkt_cls.h+3−1
@@ -145,6 +145,8 @@ enum { · 144 unmodified lines
145145 TCA_POLICE_PEAKRATE,
146146 TCA_POLICE_AVRATE,
147147 TCA_POLICE_RESULT,
148+ TCA_POLICE_TM,
149+ TCA_POLICE_PAD,
148150 __TCA_POLICE_MAX
149151 #define TCA_POLICE_RESULT TCA_POLICE_RESULT
150152 };
@@ -173,7 +175,7 @@ enum { · 22 unmodified lines
173175 TCA_U32_DIVISOR,
174176 TCA_U32_SEL,
175177 TCA_U32_POLICE,
176− TCA_U32_ACT,
178+ TCA_U32_ACT,
177179 TCA_U32_INDEV,
178180 TCA_U32_PCNT,
179181 TCA_U32_MARK,
include/uapi/sound/Kbuild+3−0
@@ -1,5 +1,6 @@
11 # UAPI Header export list
22 header-y += asequencer.h
3+header-y += asoc.h
34 header-y += asound.h
45 header-y += asound_fm.h
56 header-y += compress_offload.h
@@ -10,3 +11,5 @@ header-y += hdsp.h · 4 unmodified lines
1011 header-y += hdspm.h
1112 header-y += sb16_csp.h
1213 header-y += sfnt_info.h
14+header-y += tlv.h
15+header-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