From: Phil Auld pauld@redhat.com
redhat/configs: Disable CONFIG_RT_GROUP_SCHED in rhel config
Fedora and rhel-rt config already have CONFIG_RT_GROUP_SCHED disabled. RT_GROUP_SCHED does not play well with cgroups v2. Rather than keep this enabled, disable it in rhel going forward.
Signed-off-by: Phil Auld pauld@redhat.com
diff --git a/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED b/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_RT_GROUP_SCHED +++ /dev/null @@ -1 +0,0 @@ -CONFIG_RT_GROUP_SCHED=y diff --git a/redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED b/redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED rename from redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED rename to redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_RT_GROUP_SCHED +++ b/redhat/configs/common/generic/CONFIG_RT_GROUP_SCHED
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177
From: Prarit Bhargava on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177#note_6111690...
Acked-by: Prarit Bhargava prarit@redhat.com (via approve button)
From: Phil Auld on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177#note_6145282...
Anyone with better git-fu know how to rebase this single commit? I tried git fetch origin; git rebase origin/os-build from my branch but that failed badly with conflicts on .gitingore and .gitattributes on the initial redhat commit.
From: Don Zickus on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177#note_6145607...
@prauld, I am not sure what you did. Your steps seem correct but the MR seems to be a mess. At this point it might be faster to just create a backup branch, reset the original MR to os-build and cherry-pick the single commit over.
git checkout -b rt_group_sched_bk # verify single commit is there git checkout rt_group_sched git reset --hard origin/os-build # reset your original branch to latest os- build to start over git cherry-pick <single commit in rt_group_sched_bk>
That is just one way to move past this. I am sure there is a better way.
kernel@lists.fedoraproject.org
-
Don Zickus (via Email Bridge) -
Phil Auld (via Email Bridge)
-
Prarit Bhargava (via Email Bridge)