Received-SPF: pass (google.com: domain of linux-kernel+bounces-177928-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 13 May 2024 19:40:42 +0200
From: Borislav Petkov <bp@alien8.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: x86-ml <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] x86/alternatives for v6.10-rc1
Message-ID: <20240513174042.GAZkJQmuIGCVEfYCrg@fat_crate.local>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline

Hi Linus,

please pull x86/alternatives for v6.10-rc1.

You might encounter an easy peasy merge conflict which you can resolve
by simply zapping alternative_input_2(), i.e., what

  8dc8b02d707e ("x86/alternatives: Remove alternative_input_2()")

does.

Thx.

---

The following changes since commit fec50db7033ea478773b159e0e2efb135270e3b7:

  Linux 6.9-rc3 (2024-04-07 13:22:46 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip x86_alternatives_for_v6.10_rc1

for you to fetch changes up to 8dc8b02d707ee4167fffaf3a97003bcdac282876:

  x86/alternatives: Remove alternative_input_2() (2024-05-06 14:30:54 +0200)

----------------------------------------------------------------
- Switch the in-place instruction patching which lead to at least one weird bug
  with 32-bit guests, seeing stale instruction bytes, to one working on
  a buffer, like the rest of the alternatives code does

- Add a long overdue check to the X86_FEATURE flag modifying functions to warn
  when former get changed in a non-compatible way after alternatives have been
  patched because those changes will be already wrong

- Other cleanups

----------------------------------------------------------------
Borislav Petkov (AMD) (6):
      x86/alternatives: Catch late X86_FEATURE modifiers
      x86/alternatives: Use a temporary buffer when optimizing NOPs
      x86/alternatives: Get rid of __optimize_nops()
      x86/alternatives: Optimize optimize_nops()
      x86/alternatives: Sort local vars in apply_alternatives()
      x86/alternatives: Remove alternative_input_2()

 arch/x86/include/asm/alternative.h   |  14 ----
 arch/x86/include/asm/cpufeature.h    |   8 ++-
 arch/x86/include/asm/text-patching.h |   2 +-
 arch/x86/kernel/alternative.c        | 133 +++++++++++++++--------------------
 arch/x86/kernel/callthunks.c         |   9 +--
 arch/x86/kernel/cpu/cpuid-deps.c     |   3 +
 6 files changed, 71 insertions(+), 98 deletions(-)

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette