From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1675
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: SATA_LPM_POLICY [=0]
Type : integer
Range : [0 4]
Defined at drivers/ata/Kconfig:118
Prompt: Default SATA Link Power Management policy for low power chipsets
Depends on: ATA [=m] && HAS_DMA [=y] && SATA_AHCI [=m]
Location:
Main menu
-> Device Drivers
-> Serial ATA and Parallel ATA drivers (libata) (ATA [=m])
-> AHCI SATA support (SATA_AHCI [=m])
---
Cc: Gopal Tiwari <gtiwari(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/ark/generic/CONFIG_SATA_LPM_POLICY | 1 +
redhat/configs/ark/generic/CONFIG_SATA_MOBILE_LPM_POLICY | 1 -
redhat/configs/pending-ark/generic/CONFIG_SATA_LPM_POLICY | 15 ---------------
3 files changed, 1 insertions(+), 16 deletions(-)
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/configs: Set CONFIG_X86_AMD_PSTATE built-in on Fedora
In order to use the amd-pstate driver on AMD systems, users must first
unload the acpi-cpufreq driver and then load the amd-pstate driver.
Another option is to denylist the acpi-cpufreq driver but this also
requires user modifications to the system.
In ARK we have decided to build the amd-pstate driver into the kernel so
that it loads before the acpi-cpufreq driver. Do the same for Fedora.
Set CONFIG_X86_AMD_PSTATE to 'y' on Fedora.
Suggested-by: Joel Wirāmu Pauling <jwp(a)redhat.com>
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_X86_AMD_PSTATE b/redhat/configs/fedora/generic/x86/CONFIG_X86_AMD_PSTATE
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/x86/CONFIG_X86_AMD_PSTATE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_AMD_PSTATE=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1710
From: pjgeorg on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610
Removes all
{mark_driver,mark_hardware,pci_hw}_{disabled,deprecated,unmaintained} and
mark_tech_preview markers.
These are used in downstream RHEL to notify the user about support state.
However this only applies to that specific release and may or may not affect
future releases. Hence remove all these markers in ARK.
Note: This MR does not revert 7e761c32ef94a, 5cc4742a2435c, fa7b1655d4cfc,
df94c0106ec38, 1217d330b082f, e0be2cf6271ee, 71fc877b2e067, 117432b276e68,
96d74f2b9f3f7, d755f2826bf24 which drop PCI IDs not supported in RHEL 8/9.
Following the argument above all of these should be reverted as well.
---
arch/x86/kernel/setup.c | 2 --
drivers/net/ethernet/intel/e1000/e1000_main.c | 2 --
drivers/net/team/team.c | 2 --
drivers/net/wireguard/main.c | 1 -
drivers/virtio/virtio_mem.c | 13 -------------
fs/ext4/super.c | 5 -----
fs/xfs/xfs_super.c | 5 -----
include/linux/kernel.h | 2 +-
mm/cma.c | 10 ----------
9 files changed, 1 insertions(+), 41 deletions(-)
From: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
configs: enable CONFIG_RMI4_F3A
Upstream: RHEL only
Tested: make dist-configs
This config is required for supporting the touchpad of the Lenovo
T14 and T490 at least.
We should not disable it in RHEL.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_RMI4_F3A b/redhat/configs/common/generic/CONFIG_RMI4_F3A
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_RMI4_F3A
+++ b/redhat/configs/common/generic/CONFIG_RMI4_F3A
@@ -1 +1 @@
-# CONFIG_RMI4_F3A is not set
+CONFIG_RMI4_F3A=y
diff --git a/redhat/configs/fedora/generic/CONFIG_RMI4_F3A b/redhat/configs/fedora/generic/CONFIG_RMI4_F3A
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/CONFIG_RMI4_F3A
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RMI4_F3A=y
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1670
From: Waiman Long <longman(a)redhat.com>
mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
The gcc 12 compiler reports a "'mem_section' will never be NULL"
warning on the following code:
static inline struct mem_section *__nr_to_section(unsigned long nr)
{
#ifdef CONFIG_SPARSEMEM_EXTREME
if (!mem_section)
return NULL;
#endif
if (!mem_section[SECTION_NR_TO_ROOT(nr)])
return NULL;
:
It happens with CONFIG_SPARSEMEM_EXTREME off. The mem_section
definition is
#ifdef CONFIG_SPARSEMEM_EXTREME
extern struct mem_section **mem_section;
#else
extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
#endif
In the !CONFIG_SPARSEMEM_EXTREME case, mem_section
is a static 2-dimensional array and so the check
"!mem_section[SECTION_NR_TO_ROOT(nr)]" doesn't make sense.
Fix this warning by moving the "!mem_section[SECTION_NR_TO_ROOT(nr)]"
check up inside the CONFIG_SPARSEMEM_EXTREME block and adding an explicit
NR_SECTION_ROOTS check to make sure that there is no out-of-bound
array access.
Fixes: 3e347261a80b ("sparsemem extreme implementation")
Reported-by: Justin Forbes <jforbes(a)redhat.com>
Signed-off-by: Waiman Long <longman(a)redhat.com>
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index blahblah..blahblah 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -1397,13 +1397,16 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms)
static inline struct mem_section *__nr_to_section(unsigned long nr)
{
+ unsigned long root = SECTION_NR_TO_ROOT(nr);
+
+ if (unlikely(root >= NR_SECTION_ROOTS))
+ return NULL;
+
#ifdef CONFIG_SPARSEMEM_EXTREME
- if (!mem_section)
+ if (!mem_section || !mem_section[root])
return NULL;
#endif
- if (!mem_section[SECTION_NR_TO_ROOT(nr)])
- return NULL;
- return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
+ return &mem_section[root][nr & SECTION_ROOT_MASK];
}
extern size_t mem_section_usage_size(void);
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1598
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
Making changes to the Makefiles has been difficult and revealed minor
issues with even the simplest of changes. Having a test that compares the
Makefile variables to a "known good" set, and being able to compare the
kernel spec file to a "known good" spec file will help with testing future
changes.
I have chosen these 4 ARK commits to test with because they result in
different
versioning in the variables and the kernel specfile:
78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1)
result: 5.17.0-0.rc0.78e36f3b0dae.6.test
2585cf9dfaad := 5.16-rc5
result: 5.16.0-0.rc5.6.test
df0cc57e057f := 5.16
result: 5.16.0-6.test
fce15c45d3fb := 5.16-rc5 + 2 additional commits
result: 5.16.0-0.rc5.fce15c45d3fb.6.test
This changeset provides a better "dist-dump-variables" test that also
compares the resulting spec files. The test code does introduce two new
Makefile.variables entries both of which are clearly marked as unstable.
The genspec.sh change is minor, and is just a reorganization of the code
to speed up the creation of test files.
As indicated in the last commit, changelog generation is not yet tested.
That will come at a later date. Additional tests beyond these tests will
also be added at a later date.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/configs/build_configs.sh | 18 +-
redhat/configs/generate_all_configs.sh | 20 +-
redhat/configs/process_configs.sh | 11 +-
redhat/scripts/create-tarball.sh | 6 +-
redhat/scripts/rh-dist-git.sh | 62 +-
redhat/self-test/data/centos-2585cf9dfaad.el7 | 99 +
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 99 +
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-78e36f3b0dae.el7 | 99 +
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 99 +
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-df0cc57e057f.el7 | 99 +
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-df0cc57e057f.fc25 | 99 +
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-fce15c45d3fb.el7 | 99 +
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 99 +
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/create-data.sh | 54 +
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 97 +
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 97 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 97 +
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 97 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-df0cc57e057f.el7 | 97 +
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 97 +
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 97 +
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 97 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 97 +
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 97 +
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 97 +
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 97 +
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-df0cc57e057f.el7 | 97 +
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 97 +
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 97 +
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 97 +
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++
redhat/self-test/1005-dist-dump-variables.bats | 59 +-
redhat/Makefile | 62 +-
redhat/Makefile.rhpkg | 6 +-
redhat/Makefile.variables | 10 +-
redhat/genspec.sh | 158 +-
redhat/kernel.spec.template | 7 +-
60 files changed, 75321 insertions(+), 240 deletions(-)
From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706
Making changes to the Makefiles has been difficult and revealed minor
issues with even the simplest of changes. Having a test that compares the
Makefile variables to a "known good" set, and being able to compare the
kernel spec file to a "known good" spec file will help with testing future
changes.
I have chosen these 4 ARK commits to test with because they result in
different
versioning in the variables and the kernel specfile:
78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1)
result: 5.17.0-0.rc0.78e36f3b0dae.6.test
2585cf9dfaad := 5.16-rc5
result: 5.16.0-0.rc5.6.test
df0cc57e057f := 5.16
result: 5.16.0-6.test
fce15c45d3fb := 5.16-rc5 + 2 additional commits
result: 5.16.0-0.rc5.fce15c45d3fb.6.test
This changeset provides a better "dist-dump-variables" test that also
compares the resulting spec files. The test code does introduce two new
Makefile.variables entries both of which are clearly marked as unstable.
The genspec.sh change is minor, and is just a reorganization of the code
to speed up the creation of test files.
As indicated in the last commit, changelog generation is not yet tested.
That will come at a later date. Additional tests beyond these tests will
also be added at a later date.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/self-test/data/centos-2585cf9dfaad.el7 | 100 +
redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 100 +
redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-78e36f3b0dae.el7 | 100 +
redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 100 +
redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-df0cc57e057f.el7 | 100 +
redhat/self-test/data/centos-df0cc57e057f.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-df0cc57e057f.fc25 | 100 +
redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-fce15c45d3fb.el7 | 100 +
redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 100 +
redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/create-data.sh | 54 +
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 98 +
redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 98 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 98 +
redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 98 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-df0cc57e057f.el7 | 98 +
redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 98 +
redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 98 +
redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 98 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 98 +
redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 98 +
redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 98 +
redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 98 +
redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-df0cc57e057f.el7 | 98 +
redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 98 +
redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 98 +
redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 3032 +++++++++++++++++++
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 98 +
redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 3032 +++++++++++++++++++
redhat/self-test/1005-dist-dump-variables.bats | 59 +-
redhat/Makefile | 19 +-
redhat/Makefile.rhpkg | 6 +-
redhat/Makefile.variables | 10 +-
redhat/genspec.sh | 150 +-
54 files changed, 75306 insertions(+), 128 deletions(-)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add clk_test and clk-gate_test to mod-internal.list
These are new kunit tests added in 5.18 that need to be in
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
@@ -51,3 +51,5 @@ test_hash
test_bpf
stackinit_kunit
overflow_kunit
+clk-gate_test
+clk_test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1723