History

Merge 4.10-rc7 into staging-next

This resolves the merge errors that were reported in linux-next and it picks up the staging and IIO fixes that we need/want in here as well.

Greg Kroah-Hartman committed 9 years ago

Commit a769f302 parents 307a082 d5adbfc986 files · +9873 −5966Browse files

Showing the changes to include/uapi/linux (9 of 986 files). Show all

Unified · Split

9 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/cec-funcs.h +7 −3
  3. include/uapi/linux/ethtool.h +3 −1
  4. include/uapi/linux/netfilter/nf_log.h +2 −0
  5. include/uapi/linux/netfilter/nf_tables.h +2 −2
  6. include/uapi/linux/nl80211.h +3 −1
  7. include/uapi/linux/pkt_cls.h +1 −1
  8. include/uapi/linux/tc_act/tc_bpf.h +1 −1
  9. include/uapi/linux/timerfd.h +36 −0
include/uapi/linux/Kbuild+1−0
@@ -414,6 +414,7 @@ header-y += telephony.h · 413 unmodified lines
414414 header-y += termios.h
415415 header-y += thermal.h
416416 header-y += time.h
417+header-y += timerfd.h
417418 header-y += times.h
418419 header-y += timex.h
419420 header-y += tiocl.h
include/uapi/linux/cec-funcs.h+7−3
@@ -1665,14 +1665,15 @@ static inline void cec_msg_report_current_latency(struct cec_msg *msg, · 1664 unmodified lines
16651665 __u8 audio_out_compensated,
16661666 __u8 audio_out_delay)
16671667 {
1668− msg->len = 7;
1668+ msg->len = 6;
16691669 msg->msg[0] |= 0xf; /* broadcast */
16701670 msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY;
16711671 msg->msg[2] = phys_addr >> 8;
16721672 msg->msg[3] = phys_addr & 0xff;
16731673 msg->msg[4] = video_latency;
16741674 msg->msg[5] = (low_latency_mode << 2) | audio_out_compensated;
1675− msg->msg[6] = audio_out_delay;
1675+ if (audio_out_compensated == 3)
1676+ msg->msg[msg->len++] = audio_out_delay;
16761677 }
16771678
16781679 static inline void cec_ops_report_current_latency(const struct cec_msg *msg,
@@ -1686,7 +1687,10 @@ static inline void cec_ops_report_current_latency(const struct cec_msg *msg, · 7 unmodified lines
16861687 *video_latency = msg->msg[4];
16871688 *low_latency_mode = (msg->msg[5] >> 2) & 1;
16881689 *audio_out_compensated = msg->msg[5] & 3;
1689− *audio_out_delay = msg->msg[6];
1690+ if (*audio_out_compensated == 3 && msg->len >= 7)
1691+ *audio_out_delay = msg->msg[6];
1692+ else
1693+ *audio_out_delay = 0;
16901694 }
16911695
16921696 static inline void cec_msg_request_current_latency(struct cec_msg *msg,
include/uapi/linux/ethtool.h+3−1
@@ -1384,6 +1384,8 @@ enum ethtool_link_mode_bit_indices { · 1383 unmodified lines
13841384 ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44,
13851385 ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45,
13861386 ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46,
1387+ ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47,
1388+ ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48,
13871389
13881390
13891391 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
@@ -1393,7 +1395,7 @@ enum ethtool_link_mode_bit_indices { · 3 unmodified lines
13931395 */
13941396
13951397 __ETHTOOL_LINK_MODE_LAST
1396− = ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
1398+ = ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
13971399 };
13981400
13991401 #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
include/uapi/linux/netfilter/nf_log.h+2−0
@@ -9,4 +9,6 @@ · 8 unmodified lines
99 #define NF_LOG_MACDECODE 0x20 /* Decode MAC header */
1010 #define NF_LOG_MASK 0x2f
1111
12+#define NF_LOG_PREFIXLEN 128
13+
1214 #endif /* _NETFILTER_NF_LOG_H */
include/uapi/linux/netfilter/nf_tables.h+2−2
@@ -235,7 +235,7 @@ enum nft_rule_compat_flags { · 234 unmodified lines
235235 /**
236236 * enum nft_rule_compat_attributes - nf_tables rule compat attributes
237237 *
238− * @NFTA_RULE_COMPAT_PROTO: numerice value of handled protocol (NLA_U32)
238+ * @NFTA_RULE_COMPAT_PROTO: numeric value of handled protocol (NLA_U32)
239239 * @NFTA_RULE_COMPAT_FLAGS: bitmask of enum nft_rule_compat_flags (NLA_U32)
240240 */
241241 enum nft_rule_compat_attributes {
@@ -499,7 +499,7 @@ enum nft_bitwise_attributes { · 257 unmodified lines
499499 * enum nft_byteorder_ops - nf_tables byteorder operators
500500 *
501501 * @NFT_BYTEORDER_NTOH: network to host operator
502− * @NFT_BYTEORDER_HTON: host to network opertaor
502+ * @NFT_BYTEORDER_HTON: host to network operator
503503 */
504504 enum nft_byteorder_ops {
505505 NFT_BYTEORDER_NTOH,
include/uapi/linux/nl80211.h+3−1
@@ -1772,7 +1772,9 @@ enum nl80211_commands { · 1771 unmodified lines
17721772 *
17731773 * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode
17741774 * Notification Element based on association request when used with
1775− * %NL80211_CMD_NEW_STATION; u8 attribute.
1775+ * %NL80211_CMD_NEW_STATION or %NL80211_CMD_SET_STATION (only when
1776+ * %NL80211_FEATURE_FULL_AP_CLIENT_STATE is supported, or with TDLS);
1777+ * u8 attribute.
17761778 *
17771779 * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if
17781780 * %NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet)
include/uapi/linux/pkt_cls.h+1−1
@@ -397,7 +397,7 @@ enum { · 396 unmodified lines
397397 TCA_BPF_NAME,
398398 TCA_BPF_FLAGS,
399399 TCA_BPF_FLAGS_GEN,
400− TCA_BPF_DIGEST,
400+ TCA_BPF_TAG,
401401 __TCA_BPF_MAX,
402402 };
403403
include/uapi/linux/tc_act/tc_bpf.h+1−1
@@ -27,7 +27,7 @@ enum { · 26 unmodified lines
2727 TCA_ACT_BPF_FD,
2828 TCA_ACT_BPF_NAME,
2929 TCA_ACT_BPF_PAD,
30− TCA_ACT_BPF_DIGEST,
30+ TCA_ACT_BPF_TAG,
3131 __TCA_ACT_BPF_MAX,
3232 };
3333 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
include/uapi/linux/timerfd.h+36−0
@@ -0,0 +1,36 @@
1+/*
2+ * include/linux/timerfd.h
3+ *
4+ * Copyright (C) 2007 Davide Libenzi <davidel@xmailserver.org>
5+ *
6+ */
7+
8+#ifndef _UAPI_LINUX_TIMERFD_H
9+#define _UAPI_LINUX_TIMERFD_H
10+
11+#include <linux/types.h>
12+
13+/* For O_CLOEXEC and O_NONBLOCK */
14+#include <linux/fcntl.h>
15+
16+/* For _IO helpers */
17+#include <linux/ioctl.h>
18+
19+/*
20+ * CAREFUL: Check include/asm-generic/fcntl.h when defining
21+ * new flags, since they might collide with O_* ones. We want
22+ * to re-use O_* flags that couldn't possibly have a meaning
23+ * from eventfd, in order to leave a free define-space for
24+ * shared O_* flags.
25+ *
26+ * Also make sure to update the masks in include/linux/timerfd.h
27+ * when adding new flags.
28+ */
29+#define TFD_TIMER_ABSTIME (1 << 0)
30+#define TFD_TIMER_CANCEL_ON_SET (1 << 1)
31+#define TFD_CLOEXEC O_CLOEXEC
32+#define TFD_NONBLOCK O_NONBLOCK
33+
34+#define TFD_IOC_SET_TICKS _IOW('T', 0, __u64)
35+
36+#endif /* _UAPI_LINUX_TIMERFD_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