diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-25 07:15:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-02-25 07:15:08 -0800 |
| commit | 2f0dad8baae2042482b50977fd1d215d051510df (patch) | |
| tree | 95327dfdc868f6fd51431d58d147c6c4316a5097 /tools/perf/scripts/python/export-to-sqlite.py | |
| parent | ba30a9f9beae4c9caf70a38859701acf24b92395 (diff) | |
| parent | a75281626fc8fa6dc6c9cc314ee423e8bc45203b (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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-sqlite.py')
0 files changed, 0 insertions, 0 deletions