Merge v5.6 into drm-next

msm needed rc6, so I just went and merged release (msm has been in drm-next outside of this tree)

Dave Airlie committed 6 years ago

Commit 5fc0df92 parents 700d6ab 7111951666 files · +6433 −2881Browse files

Showing the changes to include/uapi (3 of 666 files). Show all

Unified · Split

3 files

@@ -74,6 +74,8 @@ enum { · 73 unmodified lines
74	74	#define IPPROTO_UDPLITE IPPROTO_UDPLITE
75	75	IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */
76	76	#define IPPROTO_MPLS IPPROTO_MPLS
	77	+ IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */
	78	+#define IPPROTO_ETHERNET IPPROTO_ETHERNET
77	79	IPPROTO_RAW = 255, /* Raw IP packets */
78	80	#define IPPROTO_RAW IPPROTO_RAW
79	81	IPPROTO_MPTCP = 262, /* Multipath TCP connection */

@@ -652,6 +652,9 @@ · 651 unmodified lines
652	652	/* Electronic privacy screen control */
653	653	#define KEY_PRIVACY_SCREEN_TOGGLE 0x279
654	654
	655	+/* Select an area of screen to be copied */
	656	+#define KEY_SELECTIVE_SCREENSHOT 0x27a
	657	+
655	658	/*
656	659	* Some keyboards have keys which do not have a defined meaning, these keys
657	660	* are intended to be programmed / bound to macros by the user. For most

@@ -9,7 +9,7 @@ · 8 unmodified lines
9	9	#ifndef _UAPI_SERIO_H
10	10	#define _UAPI_SERIO_H
11	11
12		−
	12	+#include <linux/const.h>
13	13	#include <linux/ioctl.h>
14	14
15	15	#define SPIOCSTYPE _IOW('q', 0x01, unsigned long)
@@ -18,10 +18,10 @@ · 2 unmodified lines
18	18	/*
19	19	* bit masks for use in "interrupt" flags (3rd argument)
20	20	*/
21		−#define SERIO_TIMEOUT BIT(0)
22		−#define SERIO_PARITY BIT(1)
23		−#define SERIO_FRAME BIT(2)
24		−#define SERIO_OOB_DATA BIT(3)
	21	+#define SERIO_TIMEOUT _BITUL(0)
	22	+#define SERIO_PARITY _BITUL(1)
	23	+#define SERIO_FRAME _BITUL(2)
	24	+#define SERIO_OOB_DATA _BITUL(3)
25	25
26	26	/*
27	27	* Serio types