From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021

centos-stream-9 !1308 [1] updates the redhat/ directory in centos-stream-9
to match that of ARK.  After that update there are about 40 changes that
are not applied to ARK but have been applied to "downstream"
centos-stream-9.  Some of these changes are centos-stream-9/RHEL9 specific
changes that should not be applied to ARK, and this MR applies the
remaining set to ARK.

Update with RHEL-only changes.

[1] https://gitlab.com/redhat/centos-stream/src/kernel/centos-
stream-9/-/merge_requests/1308

Signed-off-by: Prarit Bhargava <[email protected]>

---
 redhat/configs/ark/generic/CONFIG_OCTEONTX2_AF |    1 +
 redhat/configs/ark/generic/CONFIG_OCTEONTX2_PF |    1 +
 redhat/kabi/check-kabi                         |   39 +-
 redhat/kabi/diff-kabi                          |   42 +
 redhat/kabi/show-kabi                          |   31 +-
 redhat/kabi/symtype-generate                   |  678 +++++++++++++++++++++++++
 redhat/kabi/symtypes                           |  238 ++++++++
 redhat/kabi/update-kabi                        |  125 ++++
 redhat/rhel_files/filter-i686.sh.rhel          |    0 
 redhat/scripts/clone_tree.sh                   |   32 -
 redhat/scripts/merge-subtrees.sh               |    2 +-
 redhat/scripts/rh-dist-git.sh                  |    9 +-
 redhat/Makefile                                |  107 +++-
 redhat/Makefile.rhpkg                          |   13 -
 redhat/Makefile.variables                      |    4 +
 redhat/kernel.spec.template                    |   40 +-
 16 files changed, 1281 insertions(+), 81 deletions(-)
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to