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.
Showing the changes to include/uapi/linux (9 of 986 files). Show all
Unified · Split
| @@ -414,6 +414,7 @@ header-y += telephony.h · 413 unmodified lines | ||
| 414 | 414 | header-y += termios.h |
| 415 | 415 | header-y += thermal.h |
| 416 | 416 | header-y += time.h |
| 417 | +header-y += timerfd.h | |
| 417 | 418 | header-y += times.h |
| 418 | 419 | header-y += timex.h |
| 419 | 420 | header-y += tiocl.h |
| @@ -1665,14 +1665,15 @@ static inline void cec_msg_report_current_latency(struct cec_msg *msg, · 1664 unmodified lines | ||
| 1665 | 1665 | __u8 audio_out_compensated, |
| 1666 | 1666 | __u8 audio_out_delay) |
| 1667 | 1667 | { |
| 1668 | − msg->len = 7; | |
| 1668 | + msg->len = 6; | |
| 1669 | 1669 | msg->msg[0] |= 0xf; /* broadcast */ |
| 1670 | 1670 | msg->msg[1] = CEC_MSG_REPORT_CURRENT_LATENCY; |
| 1671 | 1671 | msg->msg[2] = phys_addr >> 8; |
| 1672 | 1672 | msg->msg[3] = phys_addr & 0xff; |
| 1673 | 1673 | msg->msg[4] = video_latency; |
| 1674 | 1674 | 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; | |
| 1676 | 1677 | } |
| 1677 | 1678 | |
| 1678 | 1679 | 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 | ||
| 1686 | 1687 | *video_latency = msg->msg[4]; |
| 1687 | 1688 | *low_latency_mode = (msg->msg[5] >> 2) & 1; |
| 1688 | 1689 | *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; | |
| 1690 | 1694 | } |
| 1691 | 1695 | |
| 1692 | 1696 | static inline void cec_msg_request_current_latency(struct cec_msg *msg, |
| @@ -1384,6 +1384,8 @@ enum ethtool_link_mode_bit_indices { · 1383 unmodified lines | ||
| 1384 | 1384 | ETHTOOL_LINK_MODE_10000baseLR_Full_BIT = 44, |
| 1385 | 1385 | ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT = 45, |
| 1386 | 1386 | ETHTOOL_LINK_MODE_10000baseER_Full_BIT = 46, |
| 1387 | + ETHTOOL_LINK_MODE_2500baseT_Full_BIT = 47, | |
| 1388 | + ETHTOOL_LINK_MODE_5000baseT_Full_BIT = 48, | |
| 1387 | 1389 | |
| 1388 | 1390 | |
| 1389 | 1391 | /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit |
| @@ -1393,7 +1395,7 @@ enum ethtool_link_mode_bit_indices { · 3 unmodified lines | ||
| 1393 | 1395 | */ |
| 1394 | 1396 | |
| 1395 | 1397 | __ETHTOOL_LINK_MODE_LAST |
| 1396 | − = ETHTOOL_LINK_MODE_10000baseER_Full_BIT, | |
| 1398 | + = ETHTOOL_LINK_MODE_5000baseT_Full_BIT, | |
| 1397 | 1399 | }; |
| 1398 | 1400 | |
| 1399 | 1401 | #define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \ |
| @@ -9,4 +9,6 @@ · 8 unmodified lines | ||
| 9 | 9 | #define NF_LOG_MACDECODE 0x20 /* Decode MAC header */ |
| 10 | 10 | #define NF_LOG_MASK 0x2f |
| 11 | 11 | |
| 12 | +#define NF_LOG_PREFIXLEN 128 | |
| 13 | + | |
| 12 | 14 | #endif /* _NETFILTER_NF_LOG_H */ |
| @@ -235,7 +235,7 @@ enum nft_rule_compat_flags { · 234 unmodified lines | ||
| 235 | 235 | /** |
| 236 | 236 | * enum nft_rule_compat_attributes - nf_tables rule compat attributes |
| 237 | 237 | * |
| 238 | − * @NFTA_RULE_COMPAT_PROTO: numerice value of handled protocol (NLA_U32) | |
| 238 | + * @NFTA_RULE_COMPAT_PROTO: numeric value of handled protocol (NLA_U32) | |
| 239 | 239 | * @NFTA_RULE_COMPAT_FLAGS: bitmask of enum nft_rule_compat_flags (NLA_U32) |
| 240 | 240 | */ |
| 241 | 241 | enum nft_rule_compat_attributes { |
| @@ -499,7 +499,7 @@ enum nft_bitwise_attributes { · 257 unmodified lines | ||
| 499 | 499 | * enum nft_byteorder_ops - nf_tables byteorder operators |
| 500 | 500 | * |
| 501 | 501 | * @NFT_BYTEORDER_NTOH: network to host operator |
| 502 | − * @NFT_BYTEORDER_HTON: host to network opertaor | |
| 502 | + * @NFT_BYTEORDER_HTON: host to network operator | |
| 503 | 503 | */ |
| 504 | 504 | enum nft_byteorder_ops { |
| 505 | 505 | NFT_BYTEORDER_NTOH, |
| @@ -1772,7 +1772,9 @@ enum nl80211_commands { · 1771 unmodified lines | ||
| 1772 | 1772 | * |
| 1773 | 1773 | * @NL80211_ATTR_OPMODE_NOTIF: Operating mode field from Operating Mode |
| 1774 | 1774 | * 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. | |
| 1776 | 1778 | * |
| 1777 | 1779 | * @NL80211_ATTR_VENDOR_ID: The vendor ID, either a 24-bit OUI or, if |
| 1778 | 1780 | * %NL80211_VENDOR_ID_IS_LINUX is set, a special Linux ID (not used yet) |
| @@ -397,7 +397,7 @@ enum { · 396 unmodified lines | ||
| 397 | 397 | TCA_BPF_NAME, |
| 398 | 398 | TCA_BPF_FLAGS, |
| 399 | 399 | TCA_BPF_FLAGS_GEN, |
| 400 | − TCA_BPF_DIGEST, | |
| 400 | + TCA_BPF_TAG, | |
| 401 | 401 | __TCA_BPF_MAX, |
| 402 | 402 | }; |
| 403 | 403 | |
| @@ -27,7 +27,7 @@ enum { · 26 unmodified lines | ||
| 27 | 27 | TCA_ACT_BPF_FD, |
| 28 | 28 | TCA_ACT_BPF_NAME, |
| 29 | 29 | TCA_ACT_BPF_PAD, |
| 30 | − TCA_ACT_BPF_DIGEST, | |
| 30 | + TCA_ACT_BPF_TAG, | |
| 31 | 31 | __TCA_ACT_BPF_MAX, |
| 32 | 32 | }; |
| 33 | 33 | #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1) |
| @@ -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 */ | |