Merge 5.13-rc2 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 May 2021 07:47:44 +0000 (09:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 May 2021 07:47:44 +0000 (09:47 +0200)
commitd8218b0de51f36f01ed67731ccf174059a33bb1e
treeb38b8856852ab651c4297c33ba47a49ca4dde419
parent76e78f3df8f5d21b1a85f770fa92a1fd211e429b
parentd07f6ca923ea0927a1024dfccafc5b53b61cfecc
Merge 5.13-rc2 into staging-next

We need the staging and iio fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c