From: Borislav Petkov <bp@suse.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: x86-ml <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] RAS updates for 5.18
Date: Wed, 23 Mar 2022 18:29:38 +0100 [thread overview]
Message-ID: <YjtZAvQnshp1pZIh@zn.tnic> (raw)
Hi Linus,
please pull the RAS side of things for 5.18.
But before you do, a git question if I may:
So the branch I'm sending you is tip/ras/core and I fast-forwarded it to
v5.17-rc4 before adding new stuff ontop.
However, I needed to have prerequisite work from another tip branch:
tip/locking/core which was fast-forwarded to v5.17-rc1 before it got
that prerequisite work added ontop.
So I merged tip/locking/core into tip/ras/core - see merge commit below
- and added the RAS stuff ontop.
However, when creating the diffstat for the pull request, it would
add additional files to it from tip/locking/core even if all the
tip/locking/core changes are already in your master branch:
$ git log master..tip/locking/core
$
After poking at it a bit more, I found a hint as to what it might be
complaining about:
$ git diff --stat master...ras_core_for_v5.18_rc1
warning: master...ras_core_for_v5.18_rc1: multiple merge bases, using 754e0b0e35608ed5206d6a67a791563c631cec07
and:
$ git merge-base -a master ras_core_for_v5.18_rc1
754e0b0e35608ed5206d6a67a791563c631cec07 - that's rc4
b008893b08dcc8c30d756db05c229a1491bcb992 - that's the top-commit of tip/locking/core at the time the merge commit was created.
So it looks like the diffstat for the pull request is created by using
the -rc4 as the merge base:
$ git diff --stat v5.17-rc4..ras_core_for_v5.18_rc1
...
while the correct diffstat should be from the merge-commit onwards:
$ git diff --stat c0f6799de2a0..ras_core_for_v5.18_rc1
...
So, long story short, what am I doing wrong?
Thx a lot!
---
The following changes since commit 754e0b0e35608ed5206d6a67a791563c631cec07:
Linux 5.17-rc4 (2022-02-13 12:13:30 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/ras_core_for_v5.18_rc1
for you to fetch changes up to 7f1b8e0d6360178e3527d4f14e6921c254a86035:
x86/mce: Remove the tolerance level control (2022-02-23 11:09:25 +0100)
----------------------------------------------------------------
- More noinstr fixes
- Add an erratum workaround for Intel CPUs which, in certain
circumstances, end up consuming an unrelated uncorrectable memory error
when using fast string copy insns
- Remove the MCE tolerance level control as it is not really needed or
used anymore
----------------------------------------------------------------
Borislav Petkov (3):
Merge tip:locking/core into tip:ras/core
x86/mce: Use arch atomic and bit helpers
x86/mce: Remove the tolerance level control
Jue Wang (1):
x86/mce: Work around an erratum on fast string copy instructions
Auto-merging MAINTAINERS
Auto-merging arch/x86/kernel/cpu/mce/core.c
Merge made by the 'ort' strategy.
Documentation/ABI/removed/sysfs-mce | 37 ++++++++++++++++
Documentation/ABI/testing/sysfs-mce | 32 --------------
Documentation/vm/hwpoison.rst | 2 -
Documentation/x86/x86_64/boot-options.rst | 9 +---
arch/x86/kernel/cpu/mce/core.c | 175 ++++++++++++++++++++++++++++++++++++++++++++-------------------------------
arch/x86/kernel/cpu/mce/internal.h | 31 +++++++++++---
arch/x86/kernel/cpu/mce/severity.c | 23 +++++-----
7 files changed, 177 insertions(+), 132 deletions(-)
create mode 100644 Documentation/ABI/removed/sysfs-mce
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Ivo Totev, HRB 36809, AG Nürnberg
next reply other threads:[~2022-03-23 17:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-23 17:29 Borislav Petkov [this message]
2022-03-25 20:01 ` [GIT PULL] RAS updates for 5.18 Linus Torvalds
2022-03-25 20:40 ` Borislav Petkov
2022-03-25 20:51 ` Linus Torvalds
2022-03-28 14:21 ` Jonathan Corbet
2022-03-28 15:56 ` Borislav Petkov
2022-03-25 21:07 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YjtZAvQnshp1pZIh@zn.tnic \
--to=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).