History

Backmerge tag 'v4.14-rc7' into drm-next

Linux 4.14-rc7 Requested by Ben Skeggs for nouveau to avoid major conflicts, and things were getting a bit conflicty already, esp around amdgpu reverts.

Dave Airlie committed 9 years ago

Commit 7a88cbd2 parents 0a4334c 0b071941048 files · +11226 −6787Browse files

Showing the changes to include/uapi (7 of 1048 files). Show all

Unified · Split

7 files
  1. include/uapi/linux/bpf.h +4 −4
  2. include/uapi/linux/dm-ioctl.h +2 −2
  3. include/uapi/linux/membarrier.h +16 −7
  4. include/uapi/linux/netfilter/xt_bpf.h +1 −0
  5. include/uapi/linux/sctp.h +1 −1
  6. include/uapi/linux/spi/spidev.h +1 −0
  7. include/uapi/linux/usb/ch9.h +1 −0
include/uapi/linux/bpf.h+4−4
@@ -312,7 +312,7 @@ union bpf_attr { · 311 unmodified lines
312 * jump into another BPF program312 * jump into another BPF program
313 * @ctx: context pointer passed to next program313 * @ctx: context pointer passed to next program
314 * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY314 * @prog_array_map: pointer to map which type is BPF_MAP_TYPE_PROG_ARRAY
315 * @index: index inside array that selects specific program to run315 * @index: 32-bit index inside array that selects specific program to run
316 * Return: 0 on success or negative error316 * Return: 0 on success or negative error
317 *317 *
318 * int bpf_clone_redirect(skb, ifindex, flags)318 * int bpf_clone_redirect(skb, ifindex, flags)
@@ -575,7 +575,7 @@ union bpf_attr { · 256 unmodified lines
575 * @map: pointer to sockmap575 * @map: pointer to sockmap
576 * @key: key to lookup sock in map576 * @key: key to lookup sock in map
577 * @flags: reserved for future use577 * @flags: reserved for future use
578 * Return: SK_REDIRECT578 * Return: SK_PASS
579 *579 *
580 * int bpf_sock_map_update(skops, map, key, flags)580 * int bpf_sock_map_update(skops, map, key, flags)
581 * @skops: pointer to bpf_sock_ops581 * @skops: pointer to bpf_sock_ops
@@ -786,8 +786,8 @@ struct xdp_md { · 204 unmodified lines
786};786};
787 787
788enum sk_action {788enum sk_action {
789 SK_ABORTED = 0,789 SK_DROP = 0,
790 SK_DROP,790 SK_PASS,
791 SK_REDIRECT,791 SK_REDIRECT,
792};792};
793 793
include/uapi/linux/dm-ioctl.h+2−2
@@ -269,9 +269,9 @@ enum { · 268 unmodified lines
269#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)269#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
270 270
271#define DM_VERSION_MAJOR 4271#define DM_VERSION_MAJOR 4
272#define DM_VERSION_MINOR 36272#define DM_VERSION_MINOR 37
273#define DM_VERSION_PATCHLEVEL 0273#define DM_VERSION_PATCHLEVEL 0
274#define DM_VERSION_EXTRA "-ioctl (2017-06-09)"274#define DM_VERSION_EXTRA "-ioctl (2017-09-20)"
275 275
276/* Status bits */276/* Status bits */
277#define DM_READONLY_FLAG (1 << 0) /* In/Out */277#define DM_READONLY_FLAG (1 << 0) /* In/Out */
include/uapi/linux/membarrier.h+16−7
@@ -52,21 +52,30 @@ · 51 unmodified lines
52 * (non-running threads are de facto in such a52 * (non-running threads are de facto in such a
53 * state). This only covers threads from the53 * state). This only covers threads from the
54 * same processes as the caller thread. This54 * same processes as the caller thread. This
55 * command returns 0. The "expedited" commands55 * command returns 0 on success. The
56 * complete faster than the non-expedited ones,56 * "expedited" commands complete faster than
57 * they never block, but have the downside of57 * the non-expedited ones, they never block,
58 * causing extra overhead.58 * but have the downside of causing extra
59 * overhead. A process needs to register its
60 * intent to use the private expedited command
61 * prior to using it, otherwise this command
62 * returns -EPERM.
63 * @MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED:
64 * Register the process intent to use
65 * MEMBARRIER_CMD_PRIVATE_EXPEDITED. Always
66 * returns 0.
59 *67 *
60 * Command to be passed to the membarrier system call. The commands need to68 * Command to be passed to the membarrier system call. The commands need to
61 * be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to69 * be a single bit each, except for MEMBARRIER_CMD_QUERY which is assigned to
62 * the value 0.70 * the value 0.
63 */71 */
64enum membarrier_cmd {72enum membarrier_cmd {
65 MEMBARRIER_CMD_QUERY = 0,73 MEMBARRIER_CMD_QUERY = 0,
66 MEMBARRIER_CMD_SHARED = (1 << 0),74 MEMBARRIER_CMD_SHARED = (1 << 0),
67 /* reserved for MEMBARRIER_CMD_SHARED_EXPEDITED (1 << 1) */75 /* reserved for MEMBARRIER_CMD_SHARED_EXPEDITED (1 << 1) */
68 /* reserved for MEMBARRIER_CMD_PRIVATE (1 << 2) */76 /* reserved for MEMBARRIER_CMD_PRIVATE (1 << 2) */
69 MEMBARRIER_CMD_PRIVATE_EXPEDITED = (1 << 3),77 MEMBARRIER_CMD_PRIVATE_EXPEDITED = (1 << 3),
78 MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED = (1 << 4),
70};79};
71 80
72#endif /* _UAPI_LINUX_MEMBARRIER_H */81#endif /* _UAPI_LINUX_MEMBARRIER_H */
include/uapi/linux/netfilter/xt_bpf.h+1−0
@@ -23,6 +23,7 @@ enum xt_bpf_modes { · 22 unmodified lines
23 XT_BPF_MODE_FD_PINNED,23 XT_BPF_MODE_FD_PINNED,
24 XT_BPF_MODE_FD_ELF,24 XT_BPF_MODE_FD_ELF,
25};25};
26#define XT_BPF_MODE_PATH_PINNED XT_BPF_MODE_FD_PINNED
26 27
27struct xt_bpf_info_v1 {28struct xt_bpf_info_v1 {
28 __u16 mode;29 __u16 mode;
include/uapi/linux/sctp.h+1−1
@@ -376,7 +376,7 @@ struct sctp_remote_error { · 375 unmodified lines
376 __u16 sre_type;376 __u16 sre_type;
377 __u16 sre_flags;377 __u16 sre_flags;
378 __u32 sre_length;378 __u32 sre_length;
379 __u16 sre_error;379 __be16 sre_error;
380 sctp_assoc_t sre_assoc_id;380 sctp_assoc_t sre_assoc_id;
381 __u8 sre_data[0];381 __u8 sre_data[0];
382};382};
include/uapi/linux/spi/spidev.h+1−0
@@ -23,6 +23,7 @@ · 22 unmodified lines
23#define SPIDEV_H23#define SPIDEV_H
24 24
25#include <linux/types.h>25#include <linux/types.h>
26#include <linux/ioctl.h>
26 27
27/* User space versions of kernel symbols for SPI clocking modes,28/* User space versions of kernel symbols for SPI clocking modes,
28 * matching <linux/spi/spi.h>29 * matching <linux/spi/spi.h>
include/uapi/linux/usb/ch9.h+1−0
@@ -780,6 +780,7 @@ struct usb_interface_assoc_descriptor { · 779 unmodified lines
780 __u8 iFunction;780 __u8 iFunction;
781} __attribute__ ((packed));781} __attribute__ ((packed));
782 782
783#define USB_DT_INTERFACE_ASSOCIATION_SIZE 8
783 784
784/*-------------------------------------------------------------------------*/785/*-------------------------------------------------------------------------*/
785 786

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t