Fun set of conflict resolutions here... For the mac80211 stuff, these were fortunately just parallel adds. Trivially resolved. In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the function phy_disable_interrupts() earlier in the file, whilst in 'net-next' the phy_error() call from this function was removed. In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the 'rt_table_id' member of rtable collided with a bug fix in 'net' that added a new struct member "rt_mtu_locked" which needs to be copied over here. The mlxsw driver conflict consisted of net-next separating the span code and definitions into separate files, whilst a 'net' bug fix made some changes to that moved code. The mlx5 infiniband conflict resolution was quite non-trivial, the RDMA tree's merge commit was used as a guide here, and here are their notes: ==================== Due to bug fixes found by the syzkaller bot and taken into the for-rc branch after development for the 4.17 merge window had already started being taken into the for-next branch, there were fairly non-trivial merge issues that would need to be resolved between the for-rc branch and the for-next branch. This merge resolves those conflicts and provides a unified base upon which ongoing development for 4.17 can be based. Conflicts: drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f9524 (IB/mlx5: Fix cleanup order on unload) added to for-rc and commit b5ca15ad7e61 (IB/mlx5: Add proper representors support) add as part of the devel cycle both needed to modify the init/de-init functions used by mlx5. To support the new representors, the new functions added by the cleanup patch needed to be made non-static, and the init/de-init list added by the representors patch needed to be modified to match the init/de-init list changes made by the cleanup patch. Updates: drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function prototypes added by representors patch to reflect new function names as changed by cleanup patch drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init stage list to match new order from cleanup patch ====================
Showing the changes to include/uapi (3 of 636 files). Show all
Unified · Split
| @@ -102,13 +102,13 @@ typedef struct siginfo { · 101 unmodified lines | |||
| 102 | short _addr_lsb; /* LSB of the reported address */ | 102 | short _addr_lsb; /* LSB of the reported address */ |
| 103 | /* used when si_code=SEGV_BNDERR */ | 103 | /* used when si_code=SEGV_BNDERR */ |
| 104 | struct { | 104 | struct { |
| 105 | short _dummy_bnd; | 105 | void *_dummy_bnd; |
| 106 | void __user *_lower; | 106 | void __user *_lower; |
| 107 | void __user *_upper; | 107 | void __user *_upper; |
| 108 | } _addr_bnd; | 108 | } _addr_bnd; |
| 109 | /* used when si_code=SEGV_PKUERR */ | 109 | /* used when si_code=SEGV_PKUERR */ |
| 110 | struct { | 110 | struct { |
| 111 | short _dummy_pkey; | 111 | void *_dummy_pkey; |
| 112 | __u32 _pkey; | 112 | __u32 _pkey; |
| 113 | } _addr_pkey; | 113 | } _addr_pkey; |
| 114 | }; | 114 | }; |
| @@ -30,6 +30,7 @@ · 29 unmodified lines | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #define ETH_ALEN 6 /* Octets in one ethernet addr */ | 32 | #define ETH_ALEN 6 /* Octets in one ethernet addr */ |
| 33 | #define ETH_TLEN 2 /* Octets in ethernet type field */ | ||
| 33 | #define ETH_HLEN 14 /* Total octets in header. */ | 34 | #define ETH_HLEN 14 /* Total octets in header. */ |
| 34 | #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ | 35 | #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ |
| 35 | #define ETH_DATA_LEN 1500 /* Max. octets in payload */ | 36 | #define ETH_DATA_LEN 1500 /* Max. octets in payload */ |
| @@ -32,6 +32,22 @@ struct ocxl_ioctl_attach { · 31 unmodified lines | |||
| 32 | __u64 reserved3; | 32 | __u64 reserved3; |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | struct ocxl_ioctl_metadata { | ||
| 36 | __u16 version; // struct version, always backwards compatible | ||
| 37 | |||
| 38 | // Version 0 fields | ||
| 39 | __u8 afu_version_major; | ||
| 40 | __u8 afu_version_minor; | ||
| 41 | __u32 pasid; // PASID assigned to the current context | ||
| 42 | |||
| 43 | __u64 pp_mmio_size; // Per PASID MMIO size | ||
| 44 | __u64 global_mmio_size; | ||
| 45 | |||
| 46 | // End version 0 fields | ||
| 47 | |||
| 48 | __u64 reserved[13]; // Total of 16*u64 | ||
| 49 | }; | ||
| 50 | |||
| 35 | struct ocxl_ioctl_irq_fd { | 51 | struct ocxl_ioctl_irq_fd { |
| 36 | __u64 irq_offset; | 52 | __u64 irq_offset; |
| 37 | __s32 eventfd; | 53 | __s32 eventfd; |
| @@ -45,5 +61,6 @@ struct ocxl_ioctl_irq_fd { · 7 unmodified lines | |||
| 45 | #define OCXL_IOCTL_IRQ_ALLOC _IOR(OCXL_MAGIC, 0x11, __u64) | 61 | #define OCXL_IOCTL_IRQ_ALLOC _IOR(OCXL_MAGIC, 0x11, __u64) |
| 46 | #define OCXL_IOCTL_IRQ_FREE _IOW(OCXL_MAGIC, 0x12, __u64) | 62 | #define OCXL_IOCTL_IRQ_FREE _IOW(OCXL_MAGIC, 0x12, __u64) |
| 47 | #define OCXL_IOCTL_IRQ_SET_FD _IOW(OCXL_MAGIC, 0x13, struct ocxl_ioctl_irq_fd) | 63 | #define OCXL_IOCTL_IRQ_SET_FD _IOW(OCXL_MAGIC, 0x13, struct ocxl_ioctl_irq_fd) |
| 64 | #define OCXL_IOCTL_GET_METADATA _IOR(OCXL_MAGIC, 0x14, struct ocxl_ioctl_metadata) | ||
| 48 | 65 | ||
| 49 | #endif /* _UAPI_MISC_OCXL_H */ | 66 | #endif /* _UAPI_MISC_OCXL_H */ |