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 (2 of 459 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/icmpv6.h +1 −0
  2. include/uapi/sound/compress_offload.h +1 −1
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
include/uapi/sound/compress_offload.h+1−1
@@ -144,7 +144,7 @@ struct snd_compr_metadata { · 143 unmodified lines
144 __u32 value[8];144 __u32 value[8];
145} __attribute__((packed, aligned(4)));145} __attribute__((packed, aligned(4)));
146 146
147/**147/*
148 * compress path ioctl definitions148 * compress path ioctl definitions
149 * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP149 * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP
150 * SNDRV_COMPRESS_GET_CODEC_CAPS: Query capability of a codec150 * SNDRV_COMPRESS_GET_CODEC_CAPS: Query capability of a codec