History

Merge v5.10-rc3 into drm-next

We need commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set pgprot_decrypted()") to be able to merge Jason's cleanup patch.

Daniel Vetter committed 6 years ago

Commit 512bce52 parents 5b8c596 f8394f2459 files · +3848 −2270Browse files

Showing the changes to include/uapi/linux (1 of 459 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