]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
projects / thirdparty / kernel / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ba30a9f a752816)
Merge branch 'staging-linus' into branch 'staging-next'
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Feb 2026 15:15:08 +0000 (07:15 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Feb 2026 15:15:08 +0000 (07:15 -0800)
commit2f0dad8baae2042482b50977fd1d215d051510df
tree95327dfdc868f6fd51431d58d147c6c4316a5097tree | snapshot
parentba30a9f9beae4c9caf70a38859701acf24b92395commit | diff
parenta75281626fc8fa6dc6c9cc314ee423e8bc45203bcommit | diff
Merge branch 'staging-linus' into branch 'staging-next'

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>
drivers/staging/rtl8723bs/core/rtw_ieee80211.c diff1 | diff2 | blob | history
drivers/staging/rtl8723bs/core/rtw_mlme.c diff1 | diff2 | blob | history
drivers/staging/sm750fb/sm750.c diff1 | diff2 | blob | history
drivers/staging/sm750fb/sm750_hw.c diff1 | diff2 | blob | history
A mirror of Linus' kernel repository