From: Mark Langsdorf <mlangsdo(a)redhat.com>
redhat: enable CONFIG_DEVTMPFS_SAFE
Include the MS_NOEXEC and MS_NOSUID mount flags when mounting devtmpfs.
Signed-off-by: Mark Langsdorf <mlangsdo(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_DEVTMPFS_SAFE b/redhat/configs/common/generic/CONFIG_DEVTMPFS_SAFE
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_DEVTMPFS_SAFE
+++ b/redhat/configs/common/generic/CONFIG_DEVTMPFS_SAFE
@@ -1 +1 @@
-# CONFIG_DEVTMPFS_SAFE is not set
+CONFIG_DEVTMPFS_SAFE=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1890
From: Don Zickus <dzickus(a)redhat.com>
Use new HOME path in ssh command
CKI recently updated the HOME variable to point to /cki instead of
/root. The .gitlab-ci.yml file applies all ssh tweaks to ~/.ssh/ which
is /cki/.ssh. However, ssh still uses /root/.ssh. So all the tweaks
are ignored and ssh connections to gitlab fail.
Fix this by telling git to use a different location with
GIT_SSH_COMMAND=ssh -o UserKnownHostsFile=$HOME/.ssh/known_hosts.
Tested locally with the cki container.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -207,6 +207,8 @@ rhel9_realtime_baseline:
- gpg2 --import "$TORVALDS_GPG_KEY"
- git checkout --track origin/master && git describe
- export PROJECT_ID="$CI_PROJECT_ID"
+ # CKI changed HOME to /cki which ssh does not pickup
+ - export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=$HOME/.ssh/known_hosts"
merge_upstream:
extends: .scheduled_setup
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1887
From: Alice Mitchell on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1784
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
This enables the partner supported AFS module in RHEL and splits the built
components out into a sub-package as per policy they should not be shipped as
part of a release but instead be delivered to the partner.
Buzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2039020
Upstream Status: RHEL only
Signed-off-by: Alice Mitchell <ajmitchell(a)redhat.com>
---
redhat/configs/ark/generic/CONFIG_AFS_FS | 1 -
redhat/configs/ark/generic/CONFIG_AF_RXRPC | 1 -
redhat/configs/fedora/generic/CONFIG_AFS_DEBUG => redhat/configs/common/generic/CONFIG_AFS_DEBUG | 0
redhat/configs/fedora/generic/CONFIG_AFS_DEBUG_CURSOR => redhat/configs/common/generic/CONFIG_AFS_DEBUG_CURSOR | 0
redhat/configs/fedora/generic/CONFIG_AFS_FS => redhat/configs/common/generic/CONFIG_AFS_FS | 0
redhat/configs/fedora/generic/CONFIG_AFS_FSCACHE => redhat/configs/common/generic/CONFIG_AFS_FSCACHE | 0
redhat/configs/fedora/generic/CONFIG_AF_RXRPC => redhat/configs/common/generic/CONFIG_AF_RXRPC | 0
redhat/configs/fedora/generic/CONFIG_AF_RXRPC_DEBUG => redhat/configs/common/generic/CONFIG_AF_RXRPC_DEBUG | 0
redhat/configs/fedora/generic/CONFIG_AF_RXRPC_INJECT_LOSS => redhat/configs/common/generic/CONFIG_AF_RXRPC_INJECT_LOSS | 0
redhat/configs/fedora/generic/CONFIG_AF_RXRPC_IPV6 => redhat/configs/common/generic/CONFIG_AF_RXRPC_IPV6 | 0
redhat/configs/common/generic/CONFIG_RXKAD | 1 +
redhat/Makefile | 1 +
redhat/kernel.spec.template | 58 ++++++++++
redhat/mod-partner.list | 2 +
14 files changed, 62 insertions(+), 2 deletions(-)
From: Vladis Dronov <vdronov(a)redhat.com>
Move CRYPTO_DEV_OCTEONTX2_CPT to a proper place
To match its location in C9S config tree.
Signed-off-by: Vladis Dronov <vdronov(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT b/redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT
rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_CRYPTO_DEV_OCTEONTX2_CPT
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1883