Commit 400ffca
Frantisek Hrbata
Merge: redhat: Update directory with ARK changes
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1308
Bugzilla: INTERNAL
This changeset is an update of the redhat/ directory.
The big reason behind this is the eventual inclusion of the -rt and -auto
configs. We want these to be in-sync with ARK. ie) reduce the amount of
work the Fedora/ARK, Auto, and RT teams have to do to review the configs.
This update was performed by executing the following command in the ARK os-build branch:
git log --oneline --no-merges redhat ':(exclude)redhat/configs/common' ':(exclude)redhat/configs/ark' ':(exclude)redhat/configs/pending-common' ':(exclude)redhat/kabi/kabi-module' ':(exclude)redhat/configs/pending-ark' ':(exclude)redhat/configs/fedora' ':(exclude)redhat/configs/pending-fedora' ':(exclude)redhat/rhdocs/' | grep -v "\[redhat\] kernel-" > /tmp/ark.list.orig
and comparing the output of this command in the centos-stream-9 main branch:
git log --oneline --no-merges redhat ':(exclude)redhat/configs/common' ':(exclude)redhat/configs/ark' ':(exclude)redhat/configs/pending-common' ':(exclude)redhat/kabi/kabi-module' ':(exclude)redhat/kernel.changelog-9.1' ':(exclude)redhat/configs/pending-ark' ':(exclude)redhat/configs/fedora' ':(exclude)redhat/configs/pending-fedora' ':(exclude)redhat/rhdocs/' | grep -v "\[redhat\] kernel-" > /tmp/rhel.list.orig
After comparing these lists it was possible to find a divergent commit and then evaluate "ARK-specific" changes to "CS9-specific" changes.
The first step in applying the "ARK-specific" changes to centos-stream-9 was to revert all the "CS9-
changes" and apply the "ARK-specific" changes. After this, the "CS9-changes" were re-applied while examining each commit to determine if the change was still applicable to centos-stream-9 + the "ARK-
specific" changes.
This results in ~40 commits that are different between ARK and centos-stream-9. Many of these commits can be forward-ported to ARK and will be done so in future commits to ARK.
Note: I am only reverting and reapplying the kernel.spec.template change in ecfde07 ("crypto: fips - make proc files report fips module name and version") to avoid issues with the CKI BZ bot.
Update the redhat/ directory.
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: Herton R. Krzesinski <herton@redhat.com>
Approved-by: Frantisek Hrbata <fhrbata@redhat.com>
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>File tree
125 files changed
+4135
-940
lines changed- redhat
- configs
- ark/generic
- arm/aarch64
- common
- debug
- generic
- arm/aarch64
- s390x/zfcpdump
- x86/i686
- generic
- pending-ark
- debug
- arm/aarch64
- powerpc
- s390x
- x86/x86_64
- generic
- arm/aarch64
- powerpc
- s390x
- x86/x86_64
- docs
- kabi
- kabi-rhel90
- kabi-rhel91
- keys
- rhel_files
- scripts
- self-test
- data
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
125 files changed
+4135
-940
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
| 7 | + | |
| 8 | + | |
0 commit comments