History

Merge tag 'v5.0-rc7' into patchwork

Linux 5.0-rc7 * tag 'v5.0-rc7': (1667 commits) Linux 5.0-rc7 Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK Input: st-keyscan - fix potential zalloc NULL dereference Input: apanel - switch to using brightness_set_blocking() powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present() efi/arm: Revert "Defer persistent reservations until after paging_init()" arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table sunrpc: fix 4 more call sites that were using stack memory with a scatterlist include/linux/module.h: copy __init/__exit attrs to init/cleanup_module Compiler Attributes: add support for __copy (gcc >= 9) lib/crc32.c: mark crc32_le_base/__crc32c_le_base aliases as __pure auxdisplay: ht16k33: fix potential user-after-free on module unload x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls i2c: bcm2835: Clear current buffer pointers and counts after a transfer i2c: cadence: Fix the hold bit setting drm: Use array_size() when creating lease dm thin: fix bug where bio that overwrites thin block ignores FUA Revert "exec: load_script: don't blindly truncate shebang string" Revert "gfs2: read journal in large chunks to locate the head" net: ethernet: freescale: set FEC ethtool regs version ...

Mauro Carvalho Chehab committed 7 years ago

Commit 5f09bc82 parents 6fd369d a3b22b91814 files · +19220 −9788Browse files

Showing the changes to include/uapi/linux (9 of 1814 files). Show all

Unified · Split

9 files
  1. include/uapi/linux/android/binderfs.h +5 −5
  2. include/uapi/linux/audit.h +2 −0
  3. include/uapi/linux/blkzoned.h +1 −0
  4. include/uapi/linux/in.h +1 −1
  5. include/uapi/linux/inet_diag.h +11 −5
  6. include/uapi/linux/input.h +5 −1
  7. include/uapi/linux/ptp_clock.h +1 −1
  8. include/uapi/linux/virtio_config.h +6 −0
  9. include/uapi/linux/virtio_ring.h +0 −10
include/uapi/linux/android/binderfs.hrenamed from include/uapi/linux/android/binder_ctl.h+5−5
@@ -4,8 +4,8 @@ · 3 unmodified lines
4 *4 *
5 */5 */
6 6
7#ifndef _UAPI_LINUX_BINDER_CTL_H7#ifndef _UAPI_LINUX_BINDERFS_H
8#define _UAPI_LINUX_BINDER_CTL_H8#define _UAPI_LINUX_BINDERFS_H
9 9
10#include <linux/android/binder.h>10#include <linux/android/binder.h>
11#include <linux/types.h>11#include <linux/types.h>
@@ -22,8 +22,8 @@ · 10 unmodified lines
22 */22 */
23struct binderfs_device {23struct binderfs_device {
24 char name[BINDERFS_MAX_NAME + 1];24 char name[BINDERFS_MAX_NAME + 1];
25 __u8 major;25 __u32 major;
26 __u8 minor;26 __u32 minor;
27};27};
28 28
29/**29/**
@@ -31,5 +31,5 @@ struct binderfs_device { · 1 unmodified line
31 */31 */
32#define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device)32#define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device)
33 33
34#endif /* _UAPI_LINUX_BINDER_CTL_H */34#endif /* _UAPI_LINUX_BINDERFS_H */
35 35
include/uapi/linux/audit.h+2−0
@@ -400,6 +400,8 @@ enum { · 399 unmodified lines
400/* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */400/* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */
401#define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT)401#define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT)
402#define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)402#define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
403#define AUDIT_ARCH_RISCV32 (EM_RISCV|__AUDIT_ARCH_LE)
404#define AUDIT_ARCH_RISCV64 (EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
403#define AUDIT_ARCH_S390 (EM_S390)405#define AUDIT_ARCH_S390 (EM_S390)
404#define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT)406#define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT)
405#define AUDIT_ARCH_SH (EM_SH)407#define AUDIT_ARCH_SH (EM_SH)
include/uapi/linux/blkzoned.h+1−0
@@ -138,6 +138,7 @@ struct blk_zone_range { · 137 unmodified lines
138 * @BLKRESETZONE: Reset the write pointer of the zones in the specified138 * @BLKRESETZONE: Reset the write pointer of the zones in the specified
139 * sector range. The sector range must be zone aligned.139 * sector range. The sector range must be zone aligned.
140 * @BLKGETZONESZ: Get the device zone size in number of 512 B sectors.140 * @BLKGETZONESZ: Get the device zone size in number of 512 B sectors.
141 * @BLKGETNRZONES: Get the total number of zones of the device.
141 */142 */
142#define BLKREPORTZONE _IOWR(0x12, 130, struct blk_zone_report)143#define BLKREPORTZONE _IOWR(0x12, 130, struct blk_zone_report)
143#define BLKRESETZONE _IOW(0x12, 131, struct blk_zone_range)144#define BLKRESETZONE _IOW(0x12, 131, struct blk_zone_range)
include/uapi/linux/in.h+1−1
@@ -268,7 +268,7 @@ struct sockaddr_in { · 267 unmodified lines
268#define IN_MULTICAST(a) IN_CLASSD(a)268#define IN_MULTICAST(a) IN_CLASSD(a)
269#define IN_MULTICAST_NET 0xe0000000269#define IN_MULTICAST_NET 0xe0000000
270 270
271#define IN_BADCLASS(a) ((((long int) (a) ) == 0xffffffff)271#define IN_BADCLASS(a) (((long int) (a) ) == (long int)0xffffffff)
272#define IN_EXPERIMENTAL(a) IN_BADCLASS((a))272#define IN_EXPERIMENTAL(a) IN_BADCLASS((a))
273 273
274#define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)274#define IN_CLASSE(a) ((((long int) (a)) & 0xf0000000) == 0xf0000000)
include/uapi/linux/inet_diag.h+11−5
@@ -137,15 +137,21 @@ enum { · 136 unmodified lines
137 INET_DIAG_TCLASS,137 INET_DIAG_TCLASS,
138 INET_DIAG_SKMEMINFO,138 INET_DIAG_SKMEMINFO,
139 INET_DIAG_SHUTDOWN,139 INET_DIAG_SHUTDOWN,
140 INET_DIAG_DCTCPINFO,140
141 INET_DIAG_PROTOCOL, /* response attribute only */141 /*
142 * Next extenstions cannot be requested in struct inet_diag_req_v2:
143 * its field idiag_ext has only 8 bits.
144 */
145
146 INET_DIAG_DCTCPINFO, /* request as INET_DIAG_VEGASINFO */
147 INET_DIAG_PROTOCOL, /* response attribute only */
142 INET_DIAG_SKV6ONLY,148 INET_DIAG_SKV6ONLY,
143 INET_DIAG_LOCALS,149 INET_DIAG_LOCALS,
144 INET_DIAG_PEERS,150 INET_DIAG_PEERS,
145 INET_DIAG_PAD,151 INET_DIAG_PAD,
146 INET_DIAG_MARK,152 INET_DIAG_MARK, /* only with CAP_NET_ADMIN */
147 INET_DIAG_BBRINFO,153 INET_DIAG_BBRINFO, /* request as INET_DIAG_VEGASINFO */
148 INET_DIAG_CLASS_ID,154 INET_DIAG_CLASS_ID, /* request as INET_DIAG_TCLASS */
149 INET_DIAG_MD5SIG,155 INET_DIAG_MD5SIG,
150 __INET_DIAG_MAX,156 __INET_DIAG_MAX,
151};157};
include/uapi/linux/input.h+5−1
@@ -26,13 +26,17 @@ · 25 unmodified lines
26 */26 */
27 27
28struct input_event {28struct input_event {
29#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL)29#if (__BITS_PER_LONG != 32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__)
30 struct timeval time;30 struct timeval time;
31#define input_event_sec time.tv_sec31#define input_event_sec time.tv_sec
32#define input_event_usec time.tv_usec32#define input_event_usec time.tv_usec
33#else33#else
34 __kernel_ulong_t __sec;34 __kernel_ulong_t __sec;
35#if defined(__sparc__) && defined(__arch64__)
36 unsigned int __usec;
37#else
35 __kernel_ulong_t __usec;38 __kernel_ulong_t __usec;
39#endif
36#define input_event_sec __sec40#define input_event_sec __sec
37#define input_event_usec __usec41#define input_event_usec __usec
38#endif42#endif
include/uapi/linux/ptp_clock.h+1−1
@@ -147,7 +147,7 @@ struct ptp_pin_desc { · 146 unmodified lines
147#define PTP_SYS_OFFSET_PRECISE \147#define PTP_SYS_OFFSET_PRECISE \
148 _IOWR(PTP_CLK_MAGIC, 8, struct ptp_sys_offset_precise)148 _IOWR(PTP_CLK_MAGIC, 8, struct ptp_sys_offset_precise)
149#define PTP_SYS_OFFSET_EXTENDED \149#define PTP_SYS_OFFSET_EXTENDED \
150 _IOW(PTP_CLK_MAGIC, 9, struct ptp_sys_offset_extended)150 _IOWR(PTP_CLK_MAGIC, 9, struct ptp_sys_offset_extended)
151 151
152struct ptp_extts_event {152struct ptp_extts_event {
153 struct ptp_clock_time t; /* Time event occured. */153 struct ptp_clock_time t; /* Time event occured. */
include/uapi/linux/virtio_config.h+6−0
@@ -78,6 +78,12 @@ · 77 unmodified lines
78/* This feature indicates support for the packed virtqueue layout. */78/* This feature indicates support for the packed virtqueue layout. */
79#define VIRTIO_F_RING_PACKED 3479#define VIRTIO_F_RING_PACKED 34
80 80
81/*
82 * This feature indicates that memory accesses by the driver and the
83 * device are ordered in a way described by the platform.
84 */
85#define VIRTIO_F_ORDER_PLATFORM 36
86
81/*87/*
82 * Does the device support Single Root I/O Virtualization?88 * Does the device support Single Root I/O Virtualization?
83 */89 */
include/uapi/linux/virtio_ring.h+0−10
@@ -213,14 +213,4 @@ struct vring_packed_desc { · 212 unmodified lines
213 __le16 flags;213 __le16 flags;
214};214};
215 215
216struct vring_packed {
217 unsigned int num;
218
219 struct vring_packed_desc *desc;
220
221 struct vring_packed_desc_event *driver;
222
223 struct vring_packed_desc_event *device;
224};
225
226#endif /* _UAPI_LINUX_VIRTIO_RING_H */216#endif /* _UAPI_LINUX_VIRTIO_RING_H */