linux-next: manual merge of the staging tree with the staging.current tree

--opswjbZ+nXVs9YrU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/rtl8723bs/core/rtw_wlan_util.c

between commit:

  ae21407350151 ("staging: rtl8723bs: fix OOB read in WMM_param_handler()")

=66rom the staging.current tree and commit:

  6e68c64a71f70 ("staging: rtl8723bs: remove unnecessary parentheses")

=66rom the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index c614c0b4c792d,8b0502a1881b5..0000000000000
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@@ -666,13 -665,10 +665,13 @@@ int WMM_param_handler(struct adapter *p
  		return false;
  	}
 =20
 +	if (pIE->length !=3D WLAN_WMM_LEN)
 +		return false;
 +
- 	if (!memcmp(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_=
para_element)))
+ 	if (!memcmp(&pmlmeinfo->WMM_param, (pIE->data + 6), sizeof(struct WMM_pa=
ra_element)))
  		return false;
 =20
- 	memcpy(&(pmlmeinfo->WMM_param), (pIE->data + 6), sizeof(struct WMM_para_=
element));
+ 	memcpy(&pmlmeinfo->WMM_param, (pIE->data + 6), sizeof(struct WMM_para_el=
ement));
 =20
  	pmlmeinfo->WMM_enable =3D 1;
  	return true;

--opswjbZ+nXVs9YrU
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmpo6UMACgkQJNaLcl1U
h9A6zQf/UG7RwXLJ3Z2JClc3yUQyX6zc6+5fLIJx2CKey+752Smk2Se9EV7Y+IPN
g9kmGyblNwM8h0UkrMPaZQqxVUpCzWXgk5CnhpXT6XzibKNcsEyNIXE0PpjntHNH
uhuGpulAN/Gm6oOp18EZcNS9U9HyvEfNoqfPA6KRA5Rv6QjErMnQ9EWQHEdKvY5D
zEEUdlO7XrJ5kLuFvwi9pI39wofWZ2VB7CuWU1rFsb4tUu4hq1UshBs/GhIPHKdC
XR3FWhHCClMCXRgIhbtEqkI6GHsR1wP0iH1BxQoWI6v8VrcchOuKeRm79RCr9xz/
mnS4koRlMabKO0BUjBvOJJPvNkM6ow==
=yz1T
-----END PGP SIGNATURE-----

--opswjbZ+nXVs9YrU--