History

Merge 5.3-rc5 into usb-next

We need the usb fixes in here as well for other patches to build on.

Greg Kroah-Hartman committed 7 years ago

Commit 7ffc95e2 parents 1e296b5 d1abaeb173 files · +1441 −814Browse files

Showing the changes to include/uapi (1 of 173 files). Show all

Unified · Split

include/uapi/rdma/siw-abi.h+2−1
@@ -180,6 +180,7 @@ struct siw_cqe { · 179 unmodified lines
180 * to control CQ arming.180 * to control CQ arming.
181 */181 */
182struct siw_cq_ctrl {182struct siw_cq_ctrl {
183 __aligned_u64 notify;183 __u32 flags;
184 __u32 pad;
184};185};
185#endif186#endif