From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Feb 2026 02:22:04 +0000 (-0800)
Subject: Merge tag 'x86_alternatives_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: ceph-for-7.0-rc4~281
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1953aa3bc92379be10b10b3bcceba1550bfbf6a;p=ceph-client.git

Merge tag 'x86_alternatives_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 alternatives update from Borislav Petkov:

 - Reorganize the alternatives patching mechanism to patch a single
   location only once instead of multiple times as it was the case with
   the two or three alternative options macros

* tag 'x86_alternatives_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/alternative: Patch a single alternative location only once
  x86/alternative: Use helper functions for patching alternatives
---

d1953aa3bc92379be10b10b3bcceba1550bfbf6a