Merge tag 'v5.15' into rdma.git for-next

Pull in the accepted for-rc patches as the next merge needs a newer base. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
2021-11-01 14:49:20 -03:00
parent 9ed8110c9b 8bb7eca972
commit a2a2a69d14
398 changed files with 3764 additions and 2229 deletions
@@ -10,6 +10,7 @@
 #define __UAPI_MCTP_H

 #include <linux/types.h>
+#include <linux/socket.h>

 typedef __u8			mctp_eid_t;

@@ -18,11 +19,13 @@ struct mctp_addr {
 };

 struct sockaddr_mctp {
-	unsigned short int	smctp_family;
-	int			smctp_network;
+	__kernel_sa_family_t	smctp_family;
+	__u16			__smctp_pad0;
+	unsigned int		smctp_network;
 	struct mctp_addr	smctp_addr;
 	__u8			smctp_type;
 	__u8			smctp_tag;
+	__u8			__smctp_pad1;
 };

 #define MCTP_NET_ANY		0x0