Required for following patches. Resolve merge conflict by using the hunk from the for-next branch and shifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()
Showing the changes to include/uapi (4 of 962 files). Show all
Unified · Split
| @@ -51,13 +51,13 @@ enum blk_zone_type { · 50 unmodified lines | |||
| 51 | * | 51 | * |
| 52 | * The Zone Condition state machine in the ZBC/ZAC standards maps the above | 52 | * The Zone Condition state machine in the ZBC/ZAC standards maps the above |
| 53 | * deinitions as: | 53 | * deinitions as: |
| 54 | * - ZC1: Empty | BLK_ZONE_EMPTY | 54 | * - ZC1: Empty | BLK_ZONE_COND_EMPTY |
| 55 | * - ZC2: Implicit Open | BLK_ZONE_COND_IMP_OPEN | 55 | * - ZC2: Implicit Open | BLK_ZONE_COND_IMP_OPEN |
| 56 | * - ZC3: Explicit Open | BLK_ZONE_COND_EXP_OPEN | 56 | * - ZC3: Explicit Open | BLK_ZONE_COND_EXP_OPEN |
| 57 | * - ZC4: Closed | BLK_ZONE_CLOSED | 57 | * - ZC4: Closed | BLK_ZONE_COND_CLOSED |
| 58 | * - ZC5: Full | BLK_ZONE_FULL | 58 | * - ZC5: Full | BLK_ZONE_COND_FULL |
| 59 | * - ZC6: Read Only | BLK_ZONE_READONLY | 59 | * - ZC6: Read Only | BLK_ZONE_COND_READONLY |
| 60 | * - ZC7: Offline | BLK_ZONE_OFFLINE | 60 | * - ZC7: Offline | BLK_ZONE_COND_OFFLINE |
| 61 | * | 61 | * |
| 62 | * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should | 62 | * Conditions 0x5 to 0xC are reserved by the current ZBC/ZAC spec and should |
| 63 | * be considered invalid. | 63 | * be considered invalid. |
| @@ -18,7 +18,11 @@ 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 | unsigned char sll_addr[8]; | 21 | union { |
| 22 | unsigned char sll_addr[8]; | ||
| 23 | /* Actual length is in sll_halen. */ | ||
| 24 | __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); | ||
| 25 | }; | ||
| 22 | }; | 26 | }; |
| 23 | 27 | ||
| 24 | /* Packet types */ | 28 | /* Packet types */ |
| @@ -710,9 +710,11 @@ enum { · 709 unmodified lines | |||
| 710 | TCA_FLOWER_KEY_CFM_OPT_UNSPEC, | 710 | TCA_FLOWER_KEY_CFM_OPT_UNSPEC, |
| 711 | TCA_FLOWER_KEY_CFM_MD_LEVEL, | 711 | TCA_FLOWER_KEY_CFM_MD_LEVEL, |
| 712 | TCA_FLOWER_KEY_CFM_OPCODE, | 712 | TCA_FLOWER_KEY_CFM_OPCODE, |
| 713 | TCA_FLOWER_KEY_CFM_OPT_MAX, | 713 | __TCA_FLOWER_KEY_CFM_OPT_MAX, |
| 714 | }; | 714 | }; |
| 715 | 715 | ||
| 716 | #define TCA_FLOWER_KEY_CFM_OPT_MAX (__TCA_FLOWER_KEY_CFM_OPT_MAX - 1) | ||
| 717 | |||
| 716 | #define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */ | 718 | #define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */ |
| 717 | 719 | ||
| 718 | /* Match-all classifier */ | 720 | /* Match-all classifier */ |
| @@ -101,4 +101,13 @@ struct ioctl_evtchn_restrict_domid { · 100 unmodified lines | |||
| 101 | domid_t domid; | 101 | domid_t domid; |
| 102 | }; | 102 | }; |
| 103 | 103 | ||
| 104 | /* | ||
| 105 | * Bind statically allocated @port. | ||
| 106 | */ | ||
| 107 | #define IOCTL_EVTCHN_BIND_STATIC \ | ||
| 108 | _IOC(_IOC_NONE, 'E', 7, sizeof(struct ioctl_evtchn_bind)) | ||
| 109 | struct ioctl_evtchn_bind { | ||
| 110 | unsigned int port; | ||
| 111 | }; | ||
| 112 | |||
| 104 | #endif /* __LINUX_PUBLIC_EVTCHN_H__ */ | 113 | #endif /* __LINUX_PUBLIC_EVTCHN_H__ */ |