Skip to content

Commit 0e70807

Browse files
committed
Rebuild rocky9_4 with kernel-5.14.0-427.28.1.el9_4
Rebuild_History BUILDABLERebuilding Kernel from rpm changelog with Fuzz Limit: 87.50% Number of commits in upstream range v4.18~1..master: 488125 Number of commits in rpm: 68 Number of commits matched with upstream: 64 (94.12%) Number of commits in upstream but not in rpm: 488061 Number of commits NOT found in upstream: 4 (5.88%) Rebuilding Kernel on Branch rocky9_4_rebuild_kernel-5.14.0-427.28.1.el9_4 for kernel-5.14.0-427.28.1.el9_4 Clean Cherry Picks: 44 (68.75%) Empty Cherry Picks: 20 (31.25%) _______________________________ Full Details Located here: ciq/ciq_backports/kernel-5.14.0-427.28.1.el9_4/rebuild.details.txt Includes: * git commit header above * Empty Commits with upstream SHA * RPM ChangeLog Entries that could not be matched Individual Empty Commit failures contained in the same containing directory. The git message for empty commits will have the path for the failed commit. File names are the first 8 characters of the upstream SHA
1 parent 2c4e419 commit 0e70807

File tree

47 files changed

+1507
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1507
-133
lines changed
File renamed without changes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
Address translation
4+
===================
5+
6+
x86 AMD
7+
-------
8+
9+
Zen-based AMD systems include a Data Fabric that manages the layout of
10+
physical memory. Devices attached to the Fabric, like memory controllers,
11+
I/O, etc., may not have a complete view of the system physical memory map.
12+
These devices may provide a "normalized", i.e. device physical, address
13+
when reporting memory errors. Normalized addresses must be translated to
14+
a system physical address for the kernel to action on the memory.
15+
16+
AMD Address Translation Library (CONFIG_AMD_ATL) provides translation for
17+
this case.
18+
19+
Glossary of acronyms used in address translation for Zen-based systems
20+
21+
* CCM = Cache Coherent Moderator
22+
* COD = Cluster-on-Die
23+
* COH_ST = Coherent Station
24+
* DF = Data Fabric
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
.. toctree::
3+
:maxdepth: 2
4+
5+
main
6+
error-decoding
7+
address-translation

Documentation/admin-guide/ras.rst renamed to Documentation/admin-guide/RAS/main.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
.. SPDX-License-Identifier: GPL-2.0
12
.. include:: <isonum.txt>
23

3-
============================================
4-
Reliability, Availability and Serviceability
5-
============================================
4+
==================================================
5+
Reliability, Availability and Serviceability (RAS)
6+
==================================================
7+
8+
This documents different aspects of the RAS functionality present in the
9+
kernel.
610

711
RAS concepts
812
************

Documentation/admin-guide/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ configure specific aspects of kernel behavior to your liking.
108108
pm/index
109109
pnp
110110
rapidio
111-
ras
111+
RAS/index
112112
rtc
113113
serial-console
114114
svga

Documentation/admin-guide/sysctl/net.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,11 @@ Will increase power usage.
204204

205205
Default: 0 (off)
206206

207+
mem_pcpu_rsv
208+
------------
209+
210+
Per-cpu reserved forward alloc cache size in page units. Default 1MB per CPU.
211+
207212
rmem_default
208213
------------
209214

MAINTAINERS

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6797,7 +6797,6 @@ R: Robert Richter <rric@kernel.org>
67976797
L: linux-edac@vger.kernel.org
67986798
S: Supported
67996799
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
6800-
F: Documentation/admin-guide/ras.rst
68016800
F: Documentation/driver-api/edac.rst
68026801
F: drivers/edac/
68036802
F: include/linux/edac.h
@@ -16242,7 +16241,8 @@ M: Tony Luck <tony.luck@intel.com>
1624216241
M: Borislav Petkov <bp@alien8.de>
1624316242
L: linux-edac@vger.kernel.org
1624416243
S: Maintained
16245-
F: Documentation/admin-guide/ras.rst
16244+
F: Documentation/RAS/
16245+
F: Documentation/admin-guide/RAS
1624616246
F: drivers/ras/
1624716247
F: include/linux/ras.h
1624816248
F: include/ras/ras_event.h
@@ -16252,6 +16252,12 @@ L: linux-wireless@vger.kernel.org
1625216252
S: Orphan
1625316253
F: drivers/net/wireless/ray*
1625416254

16255+
RAS FRU MEMORY POISON MANAGER (FMPM)
16256+
M: Yazen Ghannam <Yazen.Ghannam@amd.com>
16257+
L: linux-edac@vger.kernel.org
16258+
S: Maintained
16259+
F: drivers/ras/amd/fmpm.c
16260+
1625516261
RC-CORE / LIRC FRAMEWORK
1625616262
M: Sean Young <sean@mess.org>
1625716263
L: linux-media@vger.kernel.org

Makefile.rhelver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RHEL_MINOR = 4
1212
#
1313
# Use this spot to avoid future merge conflicts.
1414
# Do not trim this comment.
15-
RHEL_RELEASE = 427.26.1
15+
RHEL_RELEASE = 427.28.1
1616

1717
#
1818
# ZSTREAM

arch/s390/kernel/perf_cpum_cf_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset,
178178
case CPUMF_CTR_SET_CRYPTO:
179179
if (info->csvn >= 1 && info->csvn <= 5)
180180
ctrset_size = 16;
181-
else if (info->csvn == 6 || info->csvn == 7)
181+
else if (info->csvn >= 6)
182182
ctrset_size = 20;
183183
break;
184184
case CPUMF_CTR_SET_EXT:

arch/s390/kernel/perf_cpum_cf_events.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -855,16 +855,11 @@ __init const struct attribute_group **cpumf_cf_event_group(void)
855855
}
856856

857857
/* Determine version specific crypto set */
858-
switch (ci.csvn) {
859-
case 1 ... 5:
858+
csvn = none;
859+
if (ci.csvn >= 1 && ci.csvn <= 5)
860860
csvn = cpumcf_svn_12345_pmu_event_attr;
861-
break;
862-
case 6 ... 7:
861+
else if (ci.csvn >= 6)
863862
csvn = cpumcf_svn_67_pmu_event_attr;
864-
break;
865-
default:
866-
csvn = none;
867-
}
868863

869864
/* Determine model-specific counter set(s) */
870865
get_cpu_id(&cpu_id);

0 commit comments

Comments
 (0)