Merge remote-tracking branch 'staging/staging-next'

diff --cc drivers/staging/fwserial/fwserial.c
Simple merge

diff --cc drivers/staging/mt7621-dts/mt7621.dtsi
Simple merge

diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
Simple merge