[OS-BUILD PATCH] CI: use common code for merge and release
by Don Zickus (via Email Bridge)
From: Don Zickus <dzickus(a)redhat.com>
CI: use common code for merge and release
Small cleanup to simplify code by re-using duplicated sections through
extends.
Also remove legacy config branch push (now done through merge_upstream).
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
@@ -101,7 +101,7 @@ rhel9_baseline:
# scheduled job
-merge_upstream:
+.scheduled_setup
image: registry.gitlab.com/cki-project/containers/builder-fedora
variables:
GIT_DEPTH: "0"
@@ -121,10 +121,13 @@ merge_upstream:
- chmod 644 ~/.ssh/known_hosts
- git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
- gpg2 --import "$TORVALDS_GPG_KEY"
- script:
- git checkout --track origin/master && git describe
- - git checkout --track origin/os-build && git describe
- export PROJECT_ID="$CI_PROJECT_ID"
+
+merge_upstream:
+ extends: .scheduled_setup
+ script:
+ - git checkout --track origin/os-build && git describe
- make dist-merge-upstream-push || exit 1
retry: 2
rules:
@@ -132,43 +135,15 @@ merge_upstream:
# scheduled job
rawhide_release:
- image: registry.gitlab.com/cki-project/containers/builder-fedora
- variables:
- GIT_DEPTH: "0"
- GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
- before_script:
- - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
- - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
- - git config user.name "Fedora Kernel Team"
- - git config user.email "kernel-team(a)fedoraproject.org"
- - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
- # Need SSH since the clone is set up without write access.
- - eval $(ssh-agent -s)
- - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- - mkdir -p ~/.ssh
- - chmod 700 ~/.ssh
- - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
- - chmod 644 ~/.ssh/known_hosts
- - git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
- - gpg2 --import "$TORVALDS_GPG_KEY"
+ extends: .scheduled_setup
script:
- - git checkout --track origin/master && git describe
- git checkout --track origin/ark-latest && git describe
- git checkout --track origin/ark-infra && git describe
- git checkout --track origin/os-build && git describe
- - export PROJECT_ID="$CI_PROJECT_ID"
- redhat/scripts/ci/ark-create-release.sh "master" "$CI_PROJECT_ID" || exit_code=$?
- if [ $exit_code -eq 3 ]; then echo "Tag exists, halting" && exit 0; fi;
- if [ $exit_code -ne 0 ]; then echo "Unable to create release tag" && exit 1; fi;
- git push gitlab os-build
- - >
- for branch in $(git branch | grep configs/"$(date +%F)"); do
- git push \
- -o merge_request.create \
- -o merge_request.target=os-build \
- -o merge_request.remove_source_branch \
- gitlab "$branch"
- done;
# ark-create-release.sh creates a tag for ark-latest to be pushed.
# Make sure the ark-latest branch is checked out.
- git checkout ark-latest
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1264
2 years, 9 months
[OS-BUILD PATCH] redhat/configs: Enable stmmac NIC for x86_64
by Mark Salter (via Email Bridge)
From: Mark Salter <msalter(a)redhat.com>
redhat/configs: Enable stmmac NIC for x86_64
Turn on DWMAC_INTEL for x86_64.
Also adds files for:
CONFIG_NET_VENDOR_STMICRO
CONFIG_PCS_XPCS
CONFIG_PHYLINK
CONFIG_RESET_CONTROLLER
CONFIG_SFP
CONFIG_STMMAC_ETH
CONFIG_STMMAC_PCI
CONFIG_STMMAC_PLATFORM
CONFIG_STMMAC_SELFTESTS
Signed-off-by: Mark Salter <msalter(a)redhat.com>
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_DWMAC_INTEL b/redhat/configs/ark/generic/x86/x86_64/CONFIG_DWMAC_INTEL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_DWMAC_INTEL
@@ -0,0 +1 @@
+CONFIG_DWMAC_INTEL=m
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_NET_VENDOR_STMICRO b/redhat/configs/ark/generic/x86/x86_64/CONFIG_NET_VENDOR_STMICRO
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_NET_VENDOR_STMICRO
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_STMICRO=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_PCS_XPCS b/redhat/configs/ark/generic/x86/x86_64/CONFIG_PCS_XPCS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_PCS_XPCS
@@ -0,0 +1 @@
+CONFIG_PCS_XPCS=m
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_PHYLINK b/redhat/configs/ark/generic/x86/x86_64/CONFIG_PHYLINK
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_PHYLINK
@@ -0,0 +1 @@
+CONFIG_PHYLINK=m
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_RESET_CONTROLLER b/redhat/configs/ark/generic/x86/x86_64/CONFIG_RESET_CONTROLLER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_RESET_CONTROLLER
@@ -0,0 +1 @@
+CONFIG_RESET_CONTROLLER=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_SFP b/redhat/configs/ark/generic/x86/x86_64/CONFIG_SFP
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_SFP
@@ -0,0 +1 @@
+# CONFIG_SFP is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_ETH b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_ETH
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_ETH
@@ -0,0 +1 @@
+CONFIG_STMMAC_ETH=m
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_PCI b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_PCI
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_PCI
@@ -0,0 +1 @@
+# CONFIG_STMMAC_PCI is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_PLATFORM b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_PLATFORM
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_PLATFORM
@@ -0,0 +1 @@
+# CONFIG_STMMAC_PLATFORM is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_SELFTESTS b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_SELFTESTS
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/ark/generic/x86/x86_64/CONFIG_STMMAC_SELFTESTS
@@ -0,0 +1 @@
+# CONFIG_STMMAC_SELFTESTS is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1262
2 years, 9 months
Re: The 5.14 kernel in rawhide seems to be unstable, having lockups
and failed boots, didn't occur with 5.13
by stan
On Sun, 11 Jul 2021 06:22:51 -0700
stan via test <test(a)lists.fedoraproject.org> wrote:
> I normally run custom compiled rawhide kernels tuned to my hardware.
> In those I turn debugging off. I haven't been able to build one for
> 5.14 yet because of a problem in the build process. I will try again
> with the 20210709 kernel because it seems the fix for the error is in
> that package.
I was able to compile a custom kernel with the 20200709 kernel src.rpm
package. So the perf fix is working; the link that used to cause an
error now causes a warning,
warning: absolute symlink: /lib/modules/5.14.0-0.rc0.20210709gitf55966571d5e.14.20210711.fc35.x86_64/build -> /usr/src/kernels/5.14.0-0.rc0.20210709gitf55966571d5e.14.20210711.fc35.x86_64
Unfortunately, it doesn't boot correctly because it fails to get the
edid from the monitor. The rest of boot goes off without a hitch, I
can login (without seeing anything) and run commands. When I get to X,
it is in some sort of vga mode with large text and flaky colors and it
is very fragile and hangs after a short time. But I can switch from
there to a virtual console, login as root, and shutdown normally.
The Fedora rawhide kernels do not have this issue. I can see them
probe the EDID in the messages, whereas the custom kernel doesn't. The
custom kernel built with this config file had no problem booting into
this same hardware configuration with a 5.10 kernel, so something has
changed in the settings for getting edid between then and 5.14.
Anyone have a suggestion for where the problem might be?
2 years, 9 months
✅ PASS: Test report for kernel 5.13.2-300.fc34 (fedora-34)
by CKI Project
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.13.2-300.fc34
COPR build ID: 2330225
The results of these automated tests are provided below.
Overall result: PASSED
Tests: OK
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre...
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test
✅ Reboot test
✅ xfstests - ext4
✅ xfstests - xfs
✅ selinux-policy: serge-testsuite
✅ storage: software RAID testing
✅ Storage: swraid mdadm raid_module test
🚧 ❌ Podman system integration test - as root
🚧 ❌ Podman system integration test - as user
🚧 ✅ xfstests - btrfs
🚧 ✅ IPMI driver test
🚧 ✅ IPMItool loop stress test
🚧 ✅ Storage blktests
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage nvme - tcp
🚧 💥 stress: stress-ng
Host 2:
✅ Boot test
✅ Reboot test
✅ ACPI table test
✅ ACPI enabled test
✅ LTP
✅ CIFS Connectathon
✅ POSIX pjd-fstest suites
✅ Loopdev Sanity
✅ jvm - jcstress tests
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Networking bridge: sanity
✅ Ethernet drivers sanity
✅ Networking socket: fuzz
✅ Networking: igmp conformance test
✅ Networking route: pmtu
✅ Networking route_func - local
✅ Networking route_func - forward
✅ Networking TCP: keepalive test
✅ Networking UDP: socket
✅ Networking cki netfilter test
✅ Networking tunnel: geneve basic test
✅ Networking tunnel: gre basic
✅ L2TP basic test
✅ Networking tunnel: vxlan basic
✅ Networking ipsec: basic netns - transport
✅ Networking ipsec: basic netns - tunnel
✅ Libkcapi AF_ALG test
✅ pciutils: update pci ids test
✅ ALSA PCM loopback test
✅ ALSA Control (mixer) Userspace Element test
✅ storage: SCSI VPD
✅ trace: ftrace/tracer
🚧 ✅ xarray-idr-radixtree-test
🚧 ✅ i2c: i2cdetect sanity
🚧 ✅ Firmware test suite
🚧 ✅ Memory function: kaslr
🚧 ✅ audit: audit testsuite test
Test sources: https://gitlab.com/cki-project/kernel-tests
💚 Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with ⚡⚡⚡.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with ⏱.
2 years, 9 months
💥 PANICKED: Test report for kernel 5.13.2-300.fc34 (fedora-34)
by CKI Project
Hello,
We ran automated tests on the following kernel build:
Kernel package: kernel-5.13.2-300.fc34
Task URL: https://koji.fedoraproject.org/koji/taskinfo?taskID=71890492
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Tests: PANICKED
One or more kernel tests failed:
ppc64le:
❌ LTP
💥 CIFS Connectathon
aarch64:
💥 stress: stress-ng
❌ LTP
All kernel binaries, config files, and logs are available for download here:
https://arr-cki-prod-datawarehouse-public.s3.amazonaws.com/index.html?pre...
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
For the full detail on our testing procedures, please scroll to the bottom of
this message.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Hardware testing
----------------
We booted each kernel and ran the following tests:
aarch64:
Host 1:
✅ Boot test
✅ Reboot test
✅ xfstests - ext4
✅ xfstests - xfs
✅ Storage: swraid mdadm raid_module test
🚧 ✅ xfstests - btrfs
🚧 ✅ Storage blktests
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage nvme - tcp
🚧 ✅ storage: software RAID testing
🚧 💥 stress: stress-ng
Host 2:
✅ Boot test
✅ Reboot test
✅ ACPI table test
❌ LTP
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ✅ xarray-idr-radixtree-test
ppc64le:
Host 1:
✅ Boot test
✅ Reboot test
✅ xfstests - ext4
✅ xfstests - xfs
✅ Storage: swraid mdadm raid_module test
🚧 ✅ xfstests - btrfs
🚧 ✅ Storage blktests
🚧 ✅ Storage block - filesystem fio test
🚧 ✅ Storage block - queue scheduler test
🚧 ✅ Storage nvme - tcp
🚧 ✅ Storage: lvm device-mapper test - upstream
🚧 ✅ storage: software RAID testing
Host 2:
✅ Boot test
✅ Reboot test
❌ LTP
💥 CIFS Connectathon
⚡⚡⚡ Loopdev Sanity
⚡⚡⚡ Memory: fork_mem
⚡⚡⚡ Memory function: memfd_create
⚡⚡⚡ AMTU (Abstract Machine Test Utility)
⚡⚡⚡ Ethernet drivers sanity
🚧 ⚡⚡⚡ xarray-idr-radixtree-test
s390x:
Host 1:
✅ Boot test
✅ Reboot test
✅ LTP
✅ CIFS Connectathon
✅ Loopdev Sanity
✅ Memory: fork_mem
✅ Memory function: memfd_create
✅ AMTU (Abstract Machine Test Utility)
✅ Ethernet drivers sanity
🚧 ❌ xarray-idr-radixtree-test
Host 2:
✅ Boot test
✅ Reboot test
✅ Storage: swraid mdadm raid_module test
🚧 ✅ Storage blktests
🚧 ✅ Storage nvme - tcp
🚧 ✅ stress: stress-ng
x86_64:
Host 1:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ ACPI table test
⚡⚡⚡ LTP
⚡⚡⚡ CIFS Connectathon
⚡⚡⚡ Loopdev Sanity
⚡⚡⚡ Memory: fork_mem
⚡⚡⚡ Memory function: memfd_create
⚡⚡⚡ AMTU (Abstract Machine Test Utility)
⚡⚡⚡ Ethernet drivers sanity
🚧 ⚡⚡⚡ xarray-idr-radixtree-test
Host 2:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ xfstests - ext4
⚡⚡⚡ xfstests - xfs
⚡⚡⚡ xfstests - nfsv4.2
⚡⚡⚡ Storage: swraid mdadm raid_module test
🚧 ⚡⚡⚡ xfstests - btrfs
🚧 ⚡⚡⚡ xfstests - cifsv3.11
🚧 ⚡⚡⚡ Storage blktests
🚧 ⚡⚡⚡ Storage block - filesystem fio test
🚧 ⚡⚡⚡ Storage block - queue scheduler test
🚧 ⚡⚡⚡ Storage nvme - tcp
🚧 ⚡⚡⚡ Storage: lvm device-mapper test - upstream
🚧 ⚡⚡⚡ storage: software RAID testing
🚧 ⚡⚡⚡ stress: stress-ng
Host 3:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ ACPI table test
⚡⚡⚡ LTP
⚡⚡⚡ CIFS Connectathon
⚡⚡⚡ Loopdev Sanity
⚡⚡⚡ Memory: fork_mem
⚡⚡⚡ Memory function: memfd_create
⚡⚡⚡ AMTU (Abstract Machine Test Utility)
⚡⚡⚡ Ethernet drivers sanity
🚧 ⚡⚡⚡ xarray-idr-radixtree-test
Host 4:
⚡ Internal infrastructure issues prevented one or more tests (marked
with ⚡⚡⚡) from running on this architecture.
This is not the fault of the kernel that was tested.
⚡⚡⚡ Boot test
⚡⚡⚡ Reboot test
⚡⚡⚡ ACPI table test
⚡⚡⚡ LTP
⚡⚡⚡ CIFS Connectathon
⚡⚡⚡ Loopdev Sanity
⚡⚡⚡ Memory: fork_mem
⚡⚡⚡ Memory function: memfd_create
⚡⚡⚡ AMTU (Abstract Machine Test Utility)
⚡⚡⚡ Ethernet drivers sanity
🚧 ⚡⚡⚡ xarray-idr-radixtree-test
Test sources: https://gitlab.com/cki-project/kernel-tests
💚 Pull requests are welcome for new tests or improvements to existing tests!
Aborted tests
-------------
Tests that didn't complete running successfully are marked with ⚡⚡⚡.
If this was caused by an infrastructure issue, we try to mark that
explicitly in the report.
Waived tests
------------
If the test run included waived tests, they are marked with 🚧. Such tests are
executed but their results are not taken into account. Tests are waived when
their results are not reliable enough, e.g. when they're just introduced or are
being fixed.
Testing timeout
---------------
We aim to provide a report within reasonable timeframe. Tests that haven't
finished running yet are marked with ⏱.
2 years, 9 months
[OS-BUILD PATCH 0/0] [redhat] New configs in drivers/firmware
by CKI Gitlab (via Email Bridge)
From: CKI Gitlab on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1250
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.
CONFIG_ARM_FFA_TRANSPORT:
This Firmware Framework(FF) for Arm A-profile processors describes
interfaces that standardize communication between the various
software images which includes communication between images in
the Secure world and Normal world. It also leverages the
virtualization extension to isolate software images provided
by an ecosystem of vendors from each other.
This driver provides interface for all the client drivers making
use of the features offered by ARM FF-A.
Symbol: ARM_FFA_TRANSPORT [=n]
Type : tristate
Defined at drivers/firmware/arm_ffa/Kconfig:2
Prompt: Arm Firmware Framework for Armv8-A
Depends on: OF [=y] && ARM64 [=y]
Location:
-> Firmware Drivers
---
Cc: Lenny Szubowicz <lszubowi(a)redhat.com>
Cc: David Arcari <darcari(a)redhat.com>
Cc: Mark Langsdorf <mlangsdo(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/arm/aarch64/CONFIG_ARM_FFA_TRANSPORT | 1 +
redhat/configs/pending-common/generic/CONFIG_ARM_FFA_TRANSPORT | 23 ----------
2 files changed, 1 insertions(+), 23 deletions(-)
2 years, 9 months
[OS-BUILD PATCH 0/0] all: hyperv: unify the Microsoft HyperV configs
by pbrobinson (via Email Bridge)
From: pbrobinson on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1259
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.
There's no functional change here for either ARK or Fedora as the
configs were the same, this just cleans them up and unifies them
for easier mangmement.
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
redhat/configs/ark/generic/x86/x86_64/CONFIG_FB_HYPERV | 1 -
redhat/configs/ark/debug/x86/x86_64/CONFIG_HYPERV_TESTING => redhat/configs/common/debug/x86/CONFIG_HYPERV_TESTING | 0
redhat/configs/common/generic/x86/CONFIG_DRM_HYPERV | 1 +
redhat/configs/common/generic/x86/CONFIG_FB_HYPERV | 1 +
redhat/configs/ark/generic/x86/x86_64/CONFIG_HID_HYPERV_MOUSE => redhat/configs/common/generic/x86/CONFIG_HID_HYPERV_MOUSE | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV => redhat/configs/common/generic/x86/CONFIG_HYPERV | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERVISOR_GUEST => redhat/configs/common/generic/x86/CONFIG_HYPERVISOR_GUEST | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV_BALLOON => redhat/configs/common/generic/x86/CONFIG_HYPERV_BALLOON | 0
redhat/configs/ark/generic/CONFIG_HYPERV_IOMMU => redhat/configs/common/generic/x86/CONFIG_HYPERV_IOMMU | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV_KEYBOARD => redhat/configs/common/generic/x86/CONFIG_HYPERV_KEYBOARD | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV_NET => redhat/configs/common/generic/x86/CONFIG_HYPERV_NET | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV_STORAGE => redhat/configs/common/generic/x86/CONFIG_HYPERV_STORAGE | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV_UTILS => redhat/configs/common/generic/x86/CONFIG_HYPERV_UTILS | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_HYPERV_VSOCKETS => redhat/configs/common/generic/x86/CONFIG_HYPERV_VSOCKETS | 0
redhat/configs/common/generic/CONFIG_MICROSOFT_MANA => redhat/configs/common/generic/x86/CONFIG_MICROSOFT_MANA | 0
redhat/configs/ark/generic/x86/x86_64/CONFIG_PCI_HYPERV => redhat/configs/common/generic/x86/CONFIG_PCI_HYPERV | 0
redhat/configs/fedora/generic/x86/CONFIG_HID_HYPERV_MOUSE | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERVISOR_GUEST | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_BALLOON | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_IOMMU | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_KEYBOARD | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_NET | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_STORAGE | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_UTILS | 1 -
redhat/configs/fedora/generic/x86/CONFIG_HYPERV_VSOCKETS | 1 -
redhat/configs/fedora/generic/x86/CONFIG_MICROSOFT_MANA | 22 ----------
redhat/configs/fedora/generic/x86/CONFIG_PCI_HYPERV | 1 -
redhat/configs/pending-common/generic/CONFIG_DRM_HYPERV | 22 ----------
redhat/configs/pending-fedora/generic/CONFIG_DRM_HYPERV | 22 ----------
30 files changed, 2 insertions(+), 78 deletions(-)
2 years, 9 months
[OS-BUILD PATCH] Disable AMIGA_PARTITION and KARMA_PARTITION
by Prarit Bhargava (via Email Bridge)
From: Prarit Bhargava <prarit(a)redhat.com>
Disable AMIGA_PARTITION and KARMA_PARTITION
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1802694
The kernel FAST team wants these disabled for RHEL.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_AMIGA_PARTITION b/redhat/configs/ark/generic/arm/aarch64/CONFIG_AMIGA_PARTITION
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_AMIGA_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AMIGA_PARTITION is not set
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_KARMA_PARTITION b/redhat/configs/ark/generic/arm/aarch64/CONFIG_KARMA_PARTITION
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_KARMA_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KARMA_PARTITION is not set
diff --git a/redhat/configs/ark/generic/powerpc/CONFIG_AMIGA_PARTITION b/redhat/configs/ark/generic/powerpc/CONFIG_AMIGA_PARTITION
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/powerpc/CONFIG_AMIGA_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AMIGA_PARTITION is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_AMIGA_PARTITION b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_AMIGA_PARTITION
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_AMIGA_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AMIGA_PARTITION is not set
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KARMA_PARTITION b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KARMA_PARTITION
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KARMA_PARTITION
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KARMA_PARTITION is not set
diff --git a/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION b/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION
+++ b/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION
@@ -1 +1 @@
-CONFIG_AMIGA_PARTITION=y
+# CONFIG_AMIGA_PARTITION is not set
diff --git a/redhat/configs/common/generic/CONFIG_KARMA_PARTITION b/redhat/configs/common/generic/CONFIG_KARMA_PARTITION
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_KARMA_PARTITION
+++ b/redhat/configs/common/generic/CONFIG_KARMA_PARTITION
@@ -1 +1 @@
-CONFIG_KARMA_PARTITION=y
+# CONFIG_KARMA_PARTITION is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1253
2 years, 9 months
[OS-BUILD PATCH] redhat/configs: disable two partition configs
by Ming Lei (via Email Bridge)
From: Ming Lei <ming.lei(a)redhat.com>
redhat/configs: disable two partition configs
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1802694
Disable the following two configs:
CONFIG_AMIGA_PARTITION=y - it's for the old Amiga home computers
CONFIG_KARMA_PARTITION=y - it's for the Rio Karma MP3 player
both won't match rhel/fedora use case and we can't test them too, so
disable them.
Signed-off-by: Ming Lei <ming.lei(a)redhat.com>
diff --git a/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION b/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION
+++ b/redhat/configs/common/generic/CONFIG_AMIGA_PARTITION
@@ -1 +1 @@
-CONFIG_AMIGA_PARTITION=y
+# CONFIG_AMIGA_PARTITION is not set
diff --git a/redhat/configs/common/generic/CONFIG_KARMA_PARTITION b/redhat/configs/common/generic/CONFIG_KARMA_PARTITION
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/CONFIG_KARMA_PARTITION
+++ b/redhat/configs/common/generic/CONFIG_KARMA_PARTITION
@@ -1 +1 @@
-CONFIG_KARMA_PARTITION=y
+# CONFIG_KARMA_PARTITION is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1244
2 years, 9 months
[OS-BUILD PATCH] Revert "scsi: smartpqi: add inspur advantech ids"
by Herton R. Krzesinski (via Email Bridge)
From: Herton R. Krzesinski <herton(a)redhat.com>
Revert "scsi: smartpqi: add inspur advantech ids"
This reverts commit 5330336348c05ca65b2d3c485ffff4ef0f5ddf3a.
This was already applied upstream in commit 9f8d05fa98442. With this
commit we had duplicated pci ids in the table.
Signed-off-by: Herton R. Krzesinski <herton(a)redhat.com>
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index blahblah..blahblah 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -8807,18 +8807,6 @@ static const struct pci_device_id pqi_pci_id_table[] = {
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
0x19e5, 0xd22c)
},
- {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 0x1bd4, 0x004a)
- },
- {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 0x1bd4, 0x004b)
- },
- {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- 0x1bd4, 0x004c)
- },
{
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
PCI_VENDOR_ID_ADAPTEC2, 0x0110)
@@ -9075,10 +9063,6 @@ static const struct pci_device_id pqi_pci_id_table[] = {
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
PCI_VENDOR_ID_ADVANTECH, 0x8312)
},
- {
- PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
- PCI_VENDOR_ID_ADVANTECH, 0x8312)
- },
{
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
PCI_VENDOR_ID_DELL, 0x1fe0)
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1246
2 years, 9 months