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

# Conflicts:
#	Makefile

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/iommu/amd/init.c
Simple merge

diff --cc drivers/net/can/flexcan.c
Simple merge

diff --cc drivers/net/can/usb/etas_es58x/es58x_fd.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
Simple merge

diff --cc drivers/scsi/ibmvscsi/ibmvscsi.c
Simple merge

diff --cc drivers/staging/r8188eu/include/ieee80211.h
Simple merge

diff --cc drivers/staging/rtl8723bs/include/ieee80211.h
Simple merge

diff --cc include/linux/filter.h
Simple merge

diff --cc include/linux/ieee80211.h
index 694264503119d4c394cc9868477856726044a9bd,445597c03cd1bb119764105042f5de212ceaf873..ada3dd79cd083bfb1fa1dcbf645d2bd1465cd414
--- 1/include/linux/ieee80211.h
--- 2/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;

diff --cc include/linux/string.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/string.c
Simple merge

diff --cc lib/string_helpers.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge

diff --cc scripts/kernel-doc
Simple merge