Merge 5.3-rc5 into usb-next

We need the usb fixes in here as well for other patches to build on. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-08-19 07:15:42 +02:00
parent 1e296b5be4 d1abaeb3be
commit 7ffc95e90e
173 changed files with 1440 additions and 813 deletions
@@ -180,6 +180,7 @@ struct siw_cqe {
 * to control CQ arming.
 */
 struct siw_cq_ctrl {
-	__aligned_u64 notify;
+	__u32 flags;
+	__u32 pad;
 };
 #endif