diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 19:20:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 19:56:37 +0200 |
| commit | 9399ea1ce48162091fb88b162e40a9e3fbb103e5 (patch) | |
| tree | bd799c7ac05786818735b370ca623535942c45a6 /tools/perf/scripts/python/stackcollapse.py | |
| parent | bc7b9a6c2ca42b116b0f24dbaa52b5a07d96d1d6 (diff) | |
x86: fix backwards merge of GDS/SRSO bit
Stable-tree-only change.
Due to the way the GDS and SRSO patches flowed into the stable tree, it
was a 50% chance that the merge of the which value GDS and SRSO should
be. Of course, I lost that bet, and chose the opposite of what Linus
chose in commit 64094e7e3118 ("Merge tag 'gds-for-linus-2023-08-01' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
Fix this up by switching the values to match what is now in Linus's tree
as that is the correct value to mirror.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions