Skip to content
Snippets Groups Projects
user avatar
Julio Faracco authored
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/546

```
This series updates RHEL9's PCI subsystem with content from upstream v6.13 -

  Related post v6.13 (v6.14) Fixes
    7ca288760007 PCI: rockchip-ep: Fix error code in rockchip_pcie_ep
    fd46bc0e0bb3 PCI: rockchip: Add missing fields descriptions for s

  Merge tag 'pci-v6.13-fixes-3' of git://git.kernel.org/pub/scm
  https://lkml.org/lkml/2025/1/14/1378
  commit 7f5b6a8ec18e3add4c74682f60b90c31bdf849f2
  Merge: c3812b15000c 15b8968dcb90
  1 file changed, 16 insertions(+), 9 deletions(-)

  Merge tag 'pci-v6.13-fixes-2' of git://git.kernel.org/pub/scm/l
  https://lkml.org/lkml/2024/12/21/???
  commit a99b4a369a5495dbb625e1dfb5cd7a5ff6ba4bd5
  Merge: 78b1346123bb 774c71c52aa4

  Merge tag 'pci-v6.13-fixes-1' of git://git.kernel.org/pub/scm/l
  https://lkml.org/lkml/2024/11/30/474
  commit 0cb71708c5816569f8addd5c6f33cb9679e73b5b
  Merge: 8a6a03ad5b04 5c8418cf4025
  1 file changed, 7 insertions(+), 2 deletions(-)

  Merge tag 'pci-v6.13-changes' of git://git.kernel.org/pub/scm/../git/pci/pci
  https://lkml.org/lkml/2024/11/25/1200
  commit 1746db26f85e4f4b3dd11d7b55f4eff4b0423884
  Merge: 1dc707e647bc 10099266dec8
  134 files changed, 4173 insertions(+), 1164 deletions(-)

There were a number back-ports with conflicts, most were due to
out-of-order backporting (with respect to upstream), or patches that were
based on old content (i.e., not accounting for recent updates) and so
incurred the same conflict as encountered upstream.  All such occurrences
are noted in the back-port's commit message with the same changes that
occurred upstream being made in the back-port to keep things in sync.

Of special note: This MR renames a module from pci-pwrctl-pwrseq.ko to
pci-pwrctrl-pwrseq.ko.  This is done in upstream commit 3f925cd62874
"PCI/pwrctrl: Rename pwrctrl functions and structures", specifically, the
last hunk of drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c.  The name change
should not impact the customer's ability to use this module.

JIRA: https://issues.redhat.com/browse/RHEL-74285


CVE: CVE-2024-56745
CVE: CVE-2024-53152
CVE: CVE-2024-53153
CVE: CVE-2024-57809
CVE: CVE-2024-56561
CVE: CVE-2024-56689
CVE: CVE-2024-53194
Omitted-fix: 1390a33b3d04
Omitted-fix: 1b1bb7b29b10
Omitted-fix: 86a5f32ed881

Signed-off-by: default avatarMyron Stowe <mstowe@redhat.com>

```

Approved-by: default avatarTony Camuso <tcamuso@redhat.com>
Approved-by: default avatarEder Zulian <ezulian@redhat.com>
Approved-by: default avatarDavid Arcari <darcari@redhat.com>
Approved-by: default avatarJarod Wilson <jarod@redhat.com>
Approved-by: default avatarEnric Balletbo i Serra <eballetbo@redhat.com>
Approved-by: default avatarCorinna Vinschen <vinschen@redhat.com>
Approved-by: default avatarJohn W. Linville <linville@redhat.com>
Approved-by: default avatarBrian Masney <bmasney@redhat.com>
Approved-by: default avatarCKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: default avatarJulio Faracco <jfaracco@redhat.com>
0553f090
History
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
Name Last commit Last update
..