lkml.org 
[lkml]   [2021]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subject[GIT PULL (not really)] x86/core for v5.16
Hi Linus,

so this is not really a pull request but more of a question on the
process. I have merged the x86/cc branch into this branch I'm sending to
you - x86/core - and when I generate the diffstat with git request-pull,
it adds the changes of the merged branch x86/cc too, of course.

I can doctor the diffstat and the merge message by doing

 git diff --stat ^x86/cc x86_core_for_v5.16_rc1

see below, so that the merged branch's changes are not there.

But I'm not sure if this is the right thing to do. Especially if you do
not merge x86/cc first - then the below diffstat becomes wrong.

So what I've been doing with cases like that in the past is to wait
until you merge the dependent branch and then to create the proper
diffstat and pull message.

And I'm going to do it this way too but thought that maybe I should ask
if there is an alternative accepted way which I could do in the future
too, without having to wait.

Thx.

---
The following changes since commit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f:

Linux 5.15-rc1 (2021-09-12 16:28:37 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_core_for_v5.16_rc1

for you to fetch changes up to a72fdfd21e01c626273ddcf5ab740d4caef4be54:

selftests/x86/iopl: Adjust to the faked iopl CLI/STI usage (2021-10-30 23:18:04 +0200)

----------------------------------------------------------------
- Do not #GP on userspace use of CLI/STI but pretend it was a NOP to
keep old userspace from breaking. Adjust the corresponding iopl selftest
to that.

- Improve stack overflow warnings to say which stack got overflowed and
raise the exception stack sizes to 2 pages since overflowing the single
page of exception stack is very easy to do nowadays with all the tracing
machinery enabled. With that, rip out the custom mapping of AMD SEV's
too.

- A bunch of changes in preparation for FGKASLR like supporting more
than 64K section headers in the relocs tool, correct ORC lookup table
size to cover the whole kernel .text and other adjustments.

----------------------------------------------------------------
Borislav Petkov (3):
Merge branch x86/cc into x86/core
x86/sev: Make the #VC exception stacks part of the default stacks storage
selftests/x86/iopl: Adjust to the faked iopl CLI/STI usage

Kees Cook (2):
x86/boot: Allow a "silent" kaslr random byte fetch
x86/boot/compressed: Avoid duplicate malloc() implementations

Kristen Carlson Accardi (2):
x86/tools/relocs: Support >64K section headers
vmlinux.lds.h: Have ORC lookup cover entire _etext - _stext

Peter Zijlstra (3):
x86/iopl: Fake iopl(3) CLI/STI usage
x86/mm/64: Improve stack overflow warnings
x86: Increase exception stack sizes

arch/x86/boot/compressed/kaslr.c | 4 --
arch/x86/boot/compressed/misc.c | 3 +
arch/x86/boot/compressed/misc.h | 2 +
arch/x86/include/asm/cpu_entry_area.h | 8 ++-
arch/x86/include/asm/insn-eval.h | 1 +
arch/x86/include/asm/irq_stack.h | 37 ++++++++----
arch/x86/include/asm/page_64_types.h | 2 +-
arch/x86/include/asm/processor.h | 1 +
arch/x86/include/asm/stacktrace.h | 10 ++++
arch/x86/include/asm/traps.h | 6 +-
arch/x86/kernel/dumpstack_64.c | 6 ++
arch/x86/kernel/process.c | 1 +
arch/x86/kernel/sev.c | 32 -----------
arch/x86/kernel/traps.c | 58 +++++++++++++++----
arch/x86/lib/insn-eval.c | 2 +-
arch/x86/lib/kaslr.c | 18 ++++--
arch/x86/mm/cpu_entry_area.c | 7 +++
arch/x86/mm/fault.c | 20 +++----
arch/x86/tools/relocs.c | 103 +++++++++++++++++++++++++---------
include/asm-generic/vmlinux.lds.h | 3 +-
include/linux/decompress/mm.h | 12 +++-
tools/testing/selftests/x86/iopl.c | 78 ++++++++++++++++++-------
22 files changed, 284 insertions(+), 130 deletions(-)


--
Regards/Gruss,
Boris.

SUSE Software Solutions Germany GmbH, GF: Ivo Totev, HRB 36809, AG Nürnberg

\
 
 \ /
  Last update: 2021-11-01 11:25    [W:0.063 / U:1.700 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site