From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Sep 2021 03:42:47 +0000 (+1000)
Subject: Merge remote-tracking branch 'kspp/for-next/kspp'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=89f9c562217a6811fbe2c4c211b757b18f00f398;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'kspp/for-next/kspp'

# Conflicts:
#	Makefile
---

89f9c562217a6811fbe2c4c211b757b18f00f398
diff --cc include/linux/ieee80211.h
index 694264503119,445597c03cd1..ada3dd79cd08
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@@ -1292,12 -1250,8 +1292,12 @@@ struct ieee80211_mgmt 
  					u8 toa[6];
  					__le16 tod_error;
  					__le16 toa_error;
- 					u8 variable[0];
+ 					u8 variable[];
  				} __packed ftm;
 +				struct {
 +					u8 action_code;
 +					u8 variable[];
 +				} __packed s1g;
  			} u;
  		} __packed action;
  	} u;