We need the tty/serial fixes in here as well for testing, and this resolves merge conflicts in: drivers/tty/serial/serial_core.c as reported in linux-next
Showing the changes to include/uapi (2 of 556 files). Show all
Unified · Split
| @@ -44,6 +44,16 @@ extern "C" { · 43 unmodified lines | |||
| 44 | #define NOUVEAU_GETPARAM_PTIMER_TIME 14 | 44 | #define NOUVEAU_GETPARAM_PTIMER_TIME 14 |
| 45 | #define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 | 45 | #define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 |
| 46 | #define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 | 46 | #define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 |
| 47 | |||
| 48 | /** | ||
| 49 | * @NOUVEAU_GETPARAM_EXEC_PUSH_MAX | ||
| 50 | * | ||
| 51 | * Query the maximum amount of IBs that can be pushed through a single | ||
| 52 | * &drm_nouveau_exec structure and hence a single &DRM_IOCTL_NOUVEAU_EXEC | ||
| 53 | * ioctl(). | ||
| 54 | */ | ||
| 55 | #define NOUVEAU_GETPARAM_EXEC_PUSH_MAX 17 | ||
| 56 | |||
| 47 | struct drm_nouveau_getparam { | 57 | struct drm_nouveau_getparam { |
| 48 | __u64 param; | 58 | __u64 param; |
| 49 | __u64 value; | 59 | __u64 value; |
| @@ -18,11 +18,7 @@ struct sockaddr_ll { · 17 unmodified lines | |||
| 18 | unsigned short sll_hatype; | 18 | unsigned short sll_hatype; |
| 19 | unsigned char sll_pkttype; | 19 | unsigned char sll_pkttype; |
| 20 | unsigned char sll_halen; | 20 | unsigned char sll_halen; |
| 21 | union { | 21 | unsigned char sll_addr[8]; |
| 22 | unsigned char sll_addr[8]; | ||
| 23 | /* Actual length is in sll_halen. */ | ||
| 24 | __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); | ||
| 25 | }; | ||
| 26 | }; | 22 | }; |
| 27 | 23 | ||
| 28 | /* Packet types */ | 24 | /* Packet types */ |