History

Merge 5.10-rc3 into tty-next

We need the TTY/vt/serial fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit 9b085d62 parents 441494e f8394f2486 files · +4025 −2361Browse files

Showing the changes to include/uapi/linux (1 of 486 files). Show all

Unified · Split

include/uapi/linux/icmpv6.h+1−0
@@ -138,6 +138,7 @@ struct icmp6hdr { · 137 unmodified lines
138#define ICMPV6_HDR_FIELD 0138#define ICMPV6_HDR_FIELD 0
139#define ICMPV6_UNK_NEXTHDR 1139#define ICMPV6_UNK_NEXTHDR 1
140#define ICMPV6_UNK_OPTION 2140#define ICMPV6_UNK_OPTION 2
141#define ICMPV6_HDR_INCOMP 3
141 142
142/*143/*
143 * constants for (set|get)sockopt144 * constants for (set|get)sockopt