Merge 5.3-rc7' into android-mainline

Linux 5.3-rc7

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idb7a4bac47aad24a134ab4e98ea40e7bf201895b

include/linux/netfilter/nf_conntrack_h323_types.h

@@ -4,6 +4,9 @@
  * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
  */
 
+#ifndef _NF_CONNTRACK_H323_TYPES_H
+#define _NF_CONNTRACK_H323_TYPES_H
+
 typedef struct TransportAddress_ipAddress {	/* SEQUENCE */
 	int options;		/* No use */
 	unsigned int ip;
@@ -931,3 +934,5 @@ typedef struct RasMessage {	/* CHOICE */
 		InfoRequestResponse infoRequestResponse;
 	};
 } RasMessage;
+
+#endif /* _NF_CONNTRACK_H323_TYPES_H */