tree 4ce3037d01316d0f56e65fc1713cd2232b17c85a
parent f9167a2d6b943f30743de6ff8163d1981c34f9a9
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1691515248 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1691517461 +0200

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>