History

Merge v5.15-rc5 into char-misc-next

We need the fixes in here as well, and also resolve some merge conflicts in: drivers/misc/eeprom/at25.c

Greg Kroah-Hartman committed 4 years ago

Commit af40d162 parents 9a0a930 2585cf9635 files · +7175 −3182Browse files

Showing the changes to include/uapi (4 of 635 files). Show all

Unified · Split

4 files
  1. include/uapi/asm-generic/poll.h +1 −1
  2. include/uapi/drm/virtgpu_drm.h +7 −0
  3. include/uapi/linux/if_ether.h +1 −1
  4. include/uapi/linux/resource.h +10 −3
include/uapi/asm-generic/poll.h+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29#define POLLRDHUP 0x200029#define POLLRDHUP 0x2000
30#endif30#endif
31 31
32#define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */32#define POLLFREE (__force __poll_t)0x4000
33 33
34#define POLL_BUSY_LOOP (__force __poll_t)0x800034#define POLL_BUSY_LOOP (__force __poll_t)0x8000
35 35
include/uapi/drm/virtgpu_drm.h+7−0
@@ -196,6 +196,13 @@ struct drm_virtgpu_context_init { · 195 unmodified lines
196 __u64 ctx_set_params;196 __u64 ctx_set_params;
197};197};
198 198
199/*
200 * Event code that's given when VIRTGPU_CONTEXT_PARAM_POLL_RINGS_MASK is in
201 * effect. The event size is sizeof(drm_event), since there is no additional
202 * payload.
203 */
204#define VIRTGPU_EVENT_FENCE_SIGNALED 0x90000000
205
199#define DRM_IOCTL_VIRTGPU_MAP \206#define DRM_IOCTL_VIRTGPU_MAP \
200 DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map)207 DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map)
201 208
include/uapi/linux/if_ether.h+1−1
@@ -117,7 +117,7 @@ · 116 unmodified lines
117#define ETH_P_IFE 0xED3E /* ForCES inter-FE LFB type */117#define ETH_P_IFE 0xED3E /* ForCES inter-FE LFB type */
118#define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */118#define ETH_P_AF_IUCV 0xFBFB /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
119 119
120#define ETH_P_802_3_MIN 0x0600 /* If the value in the ethernet type is less than this value120#define ETH_P_802_3_MIN 0x0600 /* If the value in the ethernet type is more than this value
121 * then the frame is Ethernet II. Else it is 802.3 */121 * then the frame is Ethernet II. Else it is 802.3 */
122 122
123/*123/*
include/uapi/linux/resource.h+10−3
@@ -66,10 +66,17 @@ struct rlimit64 { · 65 unmodified lines
66#define _STK_LIM (8*1024*1024)66#define _STK_LIM (8*1024*1024)
67 67
68/*68/*
69 * GPG2 wants 64kB of mlocked memory, to make sure pass phrases69 * Limit the amount of locked memory by some sane default:
70 * and other sensitive information are never written to disk.70 * root can always increase this limit if needed.
71 *
72 * The main use-cases are (1) preventing sensitive memory
73 * from being swapped; (2) real-time operations; (3) via
74 * IOURING_REGISTER_BUFFERS.
75 *
76 * The first two don't need much. The latter will take as
77 * much as it can get. 8MB is a reasonably sane default.
71 */78 */
72#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)79#define MLOCK_LIMIT (8*1024*1024)
73 80
74/*81/*
75 * Due to binary compatibility, the actual resource numbers82 * Due to binary compatibility, the actual resource numbers