History

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh backmerge of drm-next to pull it in.

Maarten Lankhorst committed 7 years ago

Commit bcb74162 parents 90b2df5 52d2d4412204 files · +20633 −101122Browse files

Showing the changes to include/uapi/linux (2 of 12204 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/Kbuild +1 −0
  2. include/uapi/linux/fuse.h +6 −1
include/uapi/linux/Kbuild+1−0
@@ -1,3 +1,4 @@
1# SPDX-License-Identifier: GPL-2.0
1ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)2ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/a.out.h),)
2no-export-headers += a.out.h3no-export-headers += a.out.h
3endif4endif
include/uapi/linux/fuse.h+6−1
@@ -130,6 +130,9 @@ · 129 unmodified lines
130 * 7.30130 * 7.30
131 * - add FUSE_EXPLICIT_INVAL_DATA131 * - add FUSE_EXPLICIT_INVAL_DATA
132 * - add FUSE_IOCTL_COMPAT_X32132 * - add FUSE_IOCTL_COMPAT_X32
133 *
134 * 7.31
135 * - add FUSE_WRITE_KILL_PRIV flag
133 */136 */
134 137
135#ifndef _LINUX_FUSE_H138#ifndef _LINUX_FUSE_H
@@ -165,7 +168,7 @@ · 29 unmodified lines
165#define FUSE_KERNEL_VERSION 7168#define FUSE_KERNEL_VERSION 7
166 169
167/** Minor version number of this interface */170/** Minor version number of this interface */
168#define FUSE_KERNEL_MINOR_VERSION 30171#define FUSE_KERNEL_MINOR_VERSION 31
169 172
170/** The node ID of the root inode */173/** The node ID of the root inode */
171#define FUSE_ROOT_ID 1174#define FUSE_ROOT_ID 1
@@ -327,9 +330,11 @@ struct fuse_file_lock { · 155 unmodified lines
327 *330 *
328 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed331 * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed
329 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid332 * FUSE_WRITE_LOCKOWNER: lock_owner field is valid
333 * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits
330 */334 */
331#define FUSE_WRITE_CACHE (1 << 0)335#define FUSE_WRITE_CACHE (1 << 0)
332#define FUSE_WRITE_LOCKOWNER (1 << 1)336#define FUSE_WRITE_LOCKOWNER (1 << 1)
337#define FUSE_WRITE_KILL_PRIV (1 << 2)
333 338
334/**339/**
335 * Read flags340 * Read flags