Merge 5.3-rc5 into android-mainline

Linux 5.3-rc5 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ibfaea1b9aca9f04a59def096f327c2afbd0cb296
2019-08-26 16:43:17 +02:00
parent 5368c08fdb d1abaeb3be
commit a5bd47ef3f
173 changed files with 1440 additions and 813 deletions
--- a/include/uapi/rdma/siw-abi.h
+++ b/include/uapi/rdma/siw-abi.h
@@ -180,6 +180,7 @@ struct siw_cqe {
 * to control CQ arming.
 */
 struct siw_cq_ctrl {
-	__aligned_u64 notify;
+	__u32 flags;
+	__u32 pad;
 };
 #endif