Merge branch 'staging-linus' into branch 'staging-next'

Browse source

There were merge conflicts in:
	drivers/staging/rtl8723bs/core/rtw_ieee80211.c
	drivers/staging/sm750fb/sm750_hw.c

that were causing problems, so fix this up in here so that going forward
everyone is on the same page and linux-next does not have problems.

Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2026-02-25 07:15:08 -08:00

parent ba30a9f9be a75281626f

commit 2f0dad8baa

4 changed files with 26 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

15

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

View file

5

drivers/staging/rtl8723bs/core/rtw_mlme.c

View file

1

drivers/staging/sm750fb/sm750.c

View file

22

drivers/staging/sm750fb/sm750_hw.c

View file