From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile.variables: Fix typo with RHDISTGIT_TMP
RHDISTGIT_TMP should be declared with "?=".
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -144,7 +144,7 @@ ADD_COMMITID_TO_VERSION ?=
# This variable is the directory in which the dist-git repo is cloned into. This
# can be changed to a different directory for performance reasons.
-RHDISTGIT_TMP:=/tmp
+RHDISTGIT_TMP ?= /tmp
# This variable is the local dist-git clone, and is used when dist-git is updated.
RHDISTGIT_CACHE ?=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2102
From: Don Zickus <dzickus(a)redhat.com>
Remove unused ci scripts
The ARK CI process has changed over time and the following scripts are
no longer used. Remove them to avoid confusion for future contributors.
* ark-rebase-patches.sh
used to rebase patches for ark-patches. ark-patches was replaced by
the current merge based workflow.
* ark-update-changelog.sh
a legacy implementation to update the changelog on os-build from
ark-latest when ark-patches was being used. This has been replaced by
the current merge based workflow.
* sign_off_check.py
used by ci scripts to verify every MR had a signed-off-by line.
Replaced with kernel-webhooks implementation of the same idea.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/scripts/ci/ark-rebase-patches.sh b/redhat/scripts/ci/ark-rebase-patches.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/scripts/ci/ark-rebase-patches.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/bash
-#
-# Automatically rebase the kernel patches in ark-patches.
-#
-# If the REPORT_BUGS environment variable is set, any patches that do not apply
-# cleanly during the rebase are dropped, and an issue is filed to track rebasing
-# that patch.
-#
-# If run with REPORT_BUGS, you must have python3-gitlab installed and a
-# configuration file set up in ~/.python-gitlab.cfg or /etc/python-gitlab.cfg.
-# An example configuration can be found at
-# https://python-gitlab.readthedocs.io/en/stable/cli.html. If the configuration
-# is not in one of the above locations, the path can be set
-# with the PYTHON_GITLAB_CONFIG environment variable.
-#
-# Arguments:
-# 1) The commit/tag/branch to rebase onto.
-# 2) The Gitlab project ID to file issues against. See the project page on
-# Gitlab for the ID. For example, https://gitlab.com/cki-project/kernel-ark/
-# is project ID 13604247
-set -e
-
-UPSTREAM_REF=${1:-master}
-test -n "$PROJECT_ID" || PROJECT_ID="${2:-13604247}"
-
-ISSUE_TEMPLATE="During an automated rebase of ark-patches, commit %s failed to rebase.
-
-The commit in question is:
-~~~
-%s
-~~~
-
-To fix this issue:
-
-1. \`git rebase upstream ark-patches\`
-2. Use your soft, squishy brain to resolve the conflict as you see fit. If it is
- non-trivial and has an \"Upstream Status: RHEL only\" tag, ask the author
- to rebase the patch.
-3. \`if git tag -v $UPSTREAM_REF; then git branch ark/patches/$UPSTREAM_REF && git push upstream ark/patches/$UPSTREAM_REF; fi\`
-4. \`git push -f upstream ark-patches\`
-"
-
-if [ -z "$PYTHON_GITLAB_CONFIG" ]; then
- GITLAB_CONFIG_OPT=""
-else
- GITLAB_CONFIG_OPT="-c $PYTHON_GITLAB_CONFIG"
-fi
-
-# Check if ark-patches is already rebased to $UPSTREAM_REF
-test -n "$(git branch os-build --contains "$UPSTREAM_REF")" && exit 0
-
-if git show "$UPSTREAM_REF" > /dev/null 2>&1; then
- printf "Rebasing ark-patches onto %s...\n" "$UPSTREAM_REF"
-else
- printf "No such git object \"%s\" in tree\n" "$UPSTREAM_REF"
- exit 1
-fi
-
-if [ -n "$PROJECT_ID" ] && [ "$PROJECT_ID" -eq "$PROJECT_ID" ] 2> /dev/null; then
- printf "Filing issues against GitLab project ID %s\n" "$PROJECT_ID"
-else
- printf "No Gitlab project ID specified; halting!\n"
- exit 1
-fi
-
-CLEAN_REBASE=true
-if git rebase "$UPSTREAM_REF" ark-patches; then
- printf "Cleanly rebased all patches\n"
-elif [ -n "$REPORT_BUGS" ]; then
- while true; do
- CLEAN_REBASE=false
- CONFLICT=$(git am --show-current-patch)
- COMMIT=$(git am --show-current-patch | head -n1 | awk '{print $2}' | cut -c 1-12)
- TITLE=$(printf "Unable to automatically rebase commit %s" "$COMMIT")
- # shellcheck disable=SC2059 # There is a multi-line pattern in ISSUE_TEMPLATE;
- # wiki says there is no good rewrite and recommends disabling warning.
- DESC=$(printf "$ISSUE_TEMPLATE" "$COMMIT" "$CONFLICT")
- # shellcheck disable=SC2086
- # GITLAB_CONFIG_OPT DEPENDS on word splitting:
- OPEN_ISSUES=$(gitlab $GITLAB_CONFIG_OPT project-issue list --project-id "$PROJECT_ID" --search "$TITLE")
- if [ -n "$OPEN_ISSUES" ]; then
- echo "Skipping filing an issue about commit $COMMIT; already exists as $OPEN_ISSUES"
- continue
- fi
-
- # shellcheck disable=SC2086
- # GITLAB_CONFIG_OPT DEPENDS on word splitting:
- if gitlab $GITLAB_CONFIG_OPT project-issue create --project-id "$PROJECT_ID" \
- --title "$TITLE" --description "$DESC" --labels "Patch Rebase"; then
- if git rebase --skip; then
- printf "Finished dropping patches that fail to rebase\n"
- break
- else
- continue
- fi
- else
- printf "Halting rebase because an issue cannot be filed for a conflict\n"
- exit 1
- fi
- done
-else
- printf "A conflict occurred while rebase patches, please resolve manually.\n"
- exit 2
-fi
-
-if $CLEAN_REBASE; then
- if test -n "$DIST_PUSH"; then
- echo "Pushing branch ark-patches to $(git remote get-url gitlab)"
- git push -f gitlab ark-patches
- else
- printf "You can safely update ark-patches with 'git push -f <remote> ark-patches'\n"
- fi
-else
- printf "Some patches could not be rebased, fix up ark-patches as necessary"
- printf " before pushing the branch."
- exit 2
-fi
-
-if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
- printf "Creating branch \"ark/patches/%s\"\n" "$UPSTREAM_REF"
- git branch ark/patches/"$UPSTREAM_REF"
- if test -n "$DIST_PUSH"; then
- echo "Pushing branch ark/patches to $(git remote get-url gitlab)"
- git push gitlab ark/patches/"$UPSTREAM_REF"
- else
- printf "Don't forget to run 'git push <remote> ark/patches/%s'\n" "$UPSTREAM_REF"
- fi
-fi
diff --git a/redhat/scripts/ci/ark-update-changelog.sh b/redhat/scripts/ci/ark-update-changelog.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/scripts/ci/ark-update-changelog.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Update the changelog in the current branch to match the changelog in
-# ark-latest. CI runs this against the os-build branch so the change log
-# entries from the new release are pulled in and used to figure out what's
-# changed in the *next* release.
-
-set -x
-set -e
-
-git checkout ark-latest -- redhat/kernel.changelog-8.99
-git add redhat/kernel.changelog-8.99
-git checkout ark-latest -- redhat/marker
-git add redhat/marker
-
-# Did anything change?
-LINES_CHANGED=$(git diff --cached | wc -l)
-if [ "${LINES_CHANGED}" != "0" ]; then
- git commit -m "Updated changelog for the release based on $(cat redhat/marker)"
-fi
diff --git a/redhat/scripts/ci/sign_off_check.py b/redhat/scripts/ci/sign_off_check.py
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/scripts/ci/sign_off_check.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# Asserts each commit in a merge request is signed-off-by the author of the
-# commit. Exits 1 if signed-off-bys are missing, or if run in an invalid
-# context (i.e. not a merge request).
-import os
-import sys
-
-import gitlab as gitlab_module
-
-LICENSE_DOCS = "https://gitlab.com/cki-project/kernel-ark/-/wikis/Contributor-Guide#licensiā¦"
-
-# Refer to https://docs.gitlab.com/ee/ci/variables/predefined_variables.html for
-# environment variables.
-gitlab = gitlab_module.Gitlab(
- os.environ["CI_SERVER_URL"], job_token=os.environ["CI_JOB_TOKEN"], timeout=30
-)
-
-project_id = os.environ.get("CI_MERGE_REQUEST_PROJECT_ID")
-merge_request_iid = os.environ.get("CI_MERGE_REQUEST_IID")
-if project_id is None or merge_request_iid is None:
- print("This test is only valid against merge requests.")
- sys.exit(1)
-
-project = gitlab.projects.get(project_id)
-mr = project.mergerequests.get(merge_request_iid)
-
-invalid_commits = []
-for commit in mr.commits():
- sign_offs = [
- line.strip()
- for line in commit.message.splitlines()
- if line.strip().startswith("Signed-off-by:")
- ]
- required_sign_off = f"Signed-off-by: {commit.author_name} <{commit.author_email}>"
- if required_sign_off not in sign_offs:
- invalid_commits.append((commit, required_sign_off))
-
-
-if invalid_commits:
- for commit, required_sign_off in invalid_commits:
- print(f"Commit {commit.id} is missing a '{required_sign_off}' tag.")
- print(f"Refer to {LICENSE_DOCS} for details.")
- sys.exit(1)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2091
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in configs
Upstream commit 0192445cb2f7e renamed FORCE_MAX_ZONEORDER to
ARCH_FORCE_MAX_ORDER which made it appear as a new config item for us in
pending. While I have fixed up pending, this MR just fixes up the
proper config locations. All values for ARCH_FORCE_MAX_ORDER match the
values for FORCE_MAX_ZONEORDER which were valid before this MR. It is a
simple rename with no functional change to the config.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
rename from redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
index blahblah..blahblah 100644
--- a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
+++ /dev/null
@@ -1,3 +0,0 @@
-# This relies on an out of tree patch to arch/arm64/Kconfig
-# Otherwise, we would be stuck with a default of 11
-CONFIG_FORCE_MAX_ZONEORDER=13
diff --git a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
rename from redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
rename to redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
index blahblah..blahblah 100644
--- a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
+++ b/redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
diff --git a/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FORCE_MAX_ZONEORDER=9
diff --git a/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_FORCE_MAX_ORDER=13
diff --git a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_FORCE_MAX_ORDER=9
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2090
From: Prarit Bhargava <prarit(a)redhat.com>
redhat: Remove parallel_xz.sh
The parallel_xz.sh script is no longer used. It is defined as Source22 but is never
called. The script was removed from execution in ark commit
e60c3381ad10 ("Temporarily backout parallel xz script") and never put back into execution.
A quick test doesn't show a benefit of using parallel_xz.sh so it can be safely removed.
Remove the unused parallel_xz.sh script.
Additional fix: The comment line is a remnant of configuring -j for
parallel_xz.sh and can also be removed.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -640,7 +640,6 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
configs/generate_all_configs.sh \
configs/merge.pl \
configs/process_configs.sh \
- parallel_xz.sh \
../Makefile.rhelver \
README.rst \
kernel-local \
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -90,7 +90,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
-# for parallel xz processes, replace with 1 to go back to single process
%endif
%if 0%{?fedora}
@@ -760,7 +759,6 @@ Source13: redhatsecureboot003.cer
Source20: mod-denylist.sh
Source21: mod-sign.sh
-Source22: parallel_xz.sh
%define modsign_cmd %{SOURCE21}
diff --git a/redhat/parallel_xz.sh b/redhat/parallel_xz.sh
deleted file mode 100755
index blahblah..blahblah 0
--- a/redhat/parallel_xz.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# Reads filenames on stdin, xz-compresses each in place.
-# Not optimal for "compress relatively few, large files" scenario!
-
-# How many xz's to run in parallel:
-procgroup=""
-while test "$#" != 0; do
- # Get it from -jNUM
- N="${1#-j}"
- if test "$N" = "$1"; then
- # Not -j<something> - warn and ignore
- echo "parallel_xz: warning: unrecognized argument: '$1'"
- else
- procgroup="$N"
- fi
- shift
-done
-
-# If told to use only one cpu:
-test "$procgroup" || exec xargs -r xz
-test "$procgroup" = 1 && exec xargs -r xz
-
-# xz has some startup cost. If files are really small,
-# this cost might be significant. To combat this,
-# process several files (in sequence) by each xz process via -n 16:
-exec xargs -r -n 16 -P "$procgroup" xz
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2068
From: Prarit Bhargava <prarit(a)redhat.com>
redhat: Remove parallel_xz.sh
The parallel_xz.sh script is no longer used. It is defined as Source22 but is never
called. The script was removed from execution in ark commit
e60c3381ad10 ("Temporarily backout parallel xz script") and never put back into execution.
A quick test doesn't show a benefit of using parallel_xz.sh so it can be safely removed.
Remove the unused parallel_xz.sh script.
Additional fix: The comment line is a remnant of configuring -j for
parallel_xz.sh and can also be removed.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -90,7 +90,6 @@ Summary: The Linux kernel
%if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/'
-# for parallel xz processes, replace with 1 to go back to single process
%endif
%if 0%{?fedora}
@@ -760,7 +759,6 @@ Source13: redhatsecureboot003.cer
Source20: mod-denylist.sh
Source21: mod-sign.sh
-Source22: parallel_xz.sh
%define modsign_cmd %{SOURCE21}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2068
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2045
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.
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: FORTIFY_KUNIT_TEST [=m]
Type : tristate
Defined at lib/Kconfig.debug:2550
Prompt: Test fortified str*() and mem*() function internals at runtime
Depends on: RUNTIME_TESTING_MENU [=y] && KUNIT [=m] && FORTIFY_SOURCE [=y]
Visible if: RUNTIME_TESTING_MENU [=y] && KUNIT [=m] && FORTIFY_SOURCE [=y]
&& !KUNIT_ALL_TESTS [=m]
Location:
Main menu
-> Kernel hacking
-> Kernel Testing and Coverage
-> Runtime Testing (RUNTIME_TESTING_MENU [=y])
---
Symbol: IS_SIGNED_TYPE_KUNIT_TEST [=m]
Type : tristate
Defined at lib/Kconfig.debug:2514
Prompt: Test is_signed_type() macro
Depends on: RUNTIME_TESTING_MENU [=y] && KUNIT [=m]
Visible if: RUNTIME_TESTING_MENU [=y] && KUNIT [=m] && !KUNIT_ALL_TESTS
[=m]
Location:
Main menu
-> Kernel hacking
-> Kernel Testing and Coverage
-> Runtime Testing (RUNTIME_TESTING_MENU [=y])
---
Cc: Prarit Bhargava <prarit(a)redhat.com>
Cc: Aristeu Rozanski <arozansk(a)redhat.com>
Cc: Christoph von Recklinghausen <crecklin(a)redhat.com>
Cc: Eugene Syromiatnikov <esyromia(a)redhat.com>
Cc: "Herton R. Krzesinski" <herton(a)redhat.com>
Cc: Nico Pache <npache(a)redhat.com>
Cc: Oleg Nesterov <onestero(a)redhat.com>
Cc: Rafael Aquini <aquini(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/ark/generic/CONFIG_FORTIFY_KUNIT_TEST | 1 +
redhat/configs/ark/generic/CONFIG_IS_SIGNED_TYPE_KUNIT_TEST | 1 +
redhat/configs/pending-ark/generic/CONFIG_FORTIFY_KUNIT_TEST | 15 ----------
redhat/configs/pending-ark/generic/CONFIG_IS_SIGNED_TYPE_KUNIT_TEST | 15 ----------
redhat/mod-internal.list | 2 +
5 files changed, 4 insertions(+), 30 deletions(-)
From: Andrew Halaney <ahalaney(a)redhat.com>
redhat/configs/common: Turn on CONFIG_IKCONFIG_PROC
Some users expect to check /proc/config.gz instead of
/boot/config-$(uname -r), and both are valid approaches. In fact, one
could argue it is easier to trust the contents of /proc/config.gz than
it is to trust the config install at /boot/.
There's a cost to kernel size (mainly the gzipped size of the config
file), but ~50 KB isn't much compared to the size of the ~30 MB kernel
image I just compiled using the fedora aarch64 configs.
bloat-o-meter output below doesn't show the increase because the config
is injected with .incbin and uses symbol labels to grab it in C code:
[ahalaney@halaney-x13s kernel-ark]$ ./scripts/bloat-o-meter vmlinux.original vmlinux.ikconfig_proc
add/remove: 7/1 grow/shrink: 0/0 up/down: 320/-8 (312)
Function old new delta
ikconfig_init - 100 +100
config_gz_proc_ops - 88 +88
ikconfig_read_current - 68 +68
ikconfig_cleanup - 40 +40
e843419@0969_0000fd78_82f4 - 8 +8
e843419@08a0_0000e7d2_a58 - 8 +8
e843419@074e_0000bea9_8988 - 8 +8
e843419@0170_000025c9_53a8 8 - -8
Total: Before=31935449, After=31935761, chg +0.00%
[ahalaney@halaney-x13s kernel-ark]$ echo "31935761 - 31935449" | bc
312
[ahalaney@halaney-x13s kernel-ark]$
But you can still grab that bit too with a little more work:
[ahalaney@halaney-x13s kernel-ark]$ nm vmlinux.ikconfig_proc| grep kernel_config_data
ffff800008c78540 D kernel_config_data
ffff800008c8257e D kernel_config_data_end
[ahalaney@halaney-x13s kernel-ark]$ echo 'ibase=16; 8C8257E - 8C78540' | bc
41022
[ahalaney@halaney-x13s kernel-ark]$ ls -la kernel/config_data.gz
-rw-r--r-- 1 ahalaney ahalaney 41022 Sep 30 15:43 kernel/config_data.gz
[ahalaney@halaney-x13s kernel-ark]$
All in all that's not that much of a difference in the image size, so
let's enable this feature.
Signed-off-by: Andrew Halaney <ahalaney(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_IKCONFIG b/redhat/configs/common/generic/CONFIG_IKCONFIG
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_IKCONFIG
+++ b/redhat/configs/common/generic/CONFIG_IKCONFIG
@@ -1 +1 @@
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
diff --git a/redhat/configs/common/generic/CONFIG_IKCONFIG_PROC b/redhat/configs/common/generic/CONFIG_IKCONFIG_PROC
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_IKCONFIG_PROC
@@ -0,0 +1 @@
+CONFIG_IKCONFIG_PROC=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2041
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add new drm kunit tests to mod-internal.list
The drm subsystem added a number of new kunit tests in the 6.1 cycle.
These need to be added to mod-internal.list for depmod to succeed.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/mod-internal.list b/redhat/mod-internal.list
index blahblah..blahblah 100644
--- a/redhat/mod-internal.list
+++ b/redhat/mod-internal.list
@@ -6,6 +6,16 @@ cpumask_kunit
cros_kunit
dev_addr_lists_test
dmatest
+drm_buddy_test
+drm_cmdline_parser_test
+drm_damage_helper_test
+drm_dp_mst_helper_test
+drm_format_helper_test
+drm_format_test
+drm_framebuffer_test
+drm_mm_test
+drm_plane_helper_test
+drm_rect_test
ext4-inode-test
fat_test
fortify_kunit
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2059
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add acpi video to the filter_modules.sh for rhel
The ACPI_VIDEO module now has a dep on the symbol wmi_evaluate_method
and as a result it needs to be added to the module filter or depmod will
fail.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/rhel_files/filter-modules.sh.rhel b/redhat/rhel_files/filter-modules.sh.rhel
index blahblah..blahblah 100755
--- a/redhat/rhel_files/filter-modules.sh.rhel
+++ b/redhat/rhel_files/filter-modules.sh.rhel
@@ -39,7 +39,7 @@ netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee80215
drmdrvs="amd ast gma500 i2c i915 mgag200 nouveau radeon via "
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject hid-sensor-hub target_core_user sbp_target cxgbit iw_cxgb3 iw_cxgb4 cxgb3i cxgb3i cxgb3i_ddp cxgb4i chcr chtls parport_serial ism regmap-sdw regmap-sdw-mbq arizona-micsupp hid-asus nct6775 ntc_thermistor video"
# Grab the arch-specific filter list overrides
source ./filter-$2.sh
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2067