Hi Linus,
please pull a single commit which fixes a typo which sneaked in with
the previous s390 pull request.
Thanks,
Heiko
The following changes since commit 85bf17b28f97ca2749968d8786dc423db320d9c2:
recordmcount.pl: look for jgnop instruction as well as bcrl on s390 (2021-12-12 18:52:26 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.16-6
for you to fetch changes up to 4eb1782eaa9fa1c224ad1fa0d13a9f09c3ab2d80:
recordmcount.pl: fix typo in s390 mcount regex (2021-12-24 10:20:12 +0100)
----------------------------------------------------------------
s390 update for 5.16-rc8
- fix s390 mcount regex typo in recordmcount.pl
----------------------------------------------------------------
Heiko Carstens (1):
recordmcount.pl: fix typo in s390 mcount regex
scripts/recordmcount.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 52a000b057a5..3ccb2c70add4 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -219,7 +219,7 @@ if ($arch eq "x86_64") {
} elsif ($arch eq "s390" && $bits == 64) {
if ($cc =~ /-DCC_USING_HOTPATCH/) {
- $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(bcrl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
+ $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*c0 04 00 00 00 00\\s*(brcl\\s*0,|jgnop\\s*)[0-9a-f]+ <([^\+]*)>\$";
$mcount_adjust = 0;
}
$alignment = 8;
The pull request you sent on Wed, 29 Dec 2021 10:56:19 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.16-6
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/eec4df26e24e978e49ccf9bcf49ca0f2ccdaeffe
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html