Two trivial overlapping changes conflicts in MPLS and mlx5.
Showing the changes to include/uapi/linux (3 of 485 files). Show all
Unified · Split
| @@ -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, |
| @@ -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, |