From: Don Zickus <dzickus(a)redhat.com>
Add wildcard macros -baseonly -gcov
There are multiple usecases for -baseonly and -gcov on various
targets in the Makefile. Instead of calling those targets out
repeatedly, lets generalize them a bit.
Allow adding -baseonly and -gcov to:
dist-rpm
dist-srpm
dist-brew
dist-koji
distg-brew
distg-koji
Gcov is useful for adding code coverage. Baseonly is useful to only
build the kernel for debugging purposes without userspace tools.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -297,6 +297,12 @@ dist-sources: dist-kabi dist-kabi-dup sources-rh
dist-test-patch: generate-testpatch-tmp
@mv $(TESTPATCH).tmp $(TESTPATCH);
+%-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools --without selftests -bb
+%-baseonly: BUILDOPTS+=-debug -debuginfo -vdso_install -bpftool -perf -tools -selftests
+
+%-gcov: BUILDID=".gcov"
+%-gcov: BUILDOPTS+="+gcov"
+
do-rpmbuild: dist-sources
$(RPMBUILD) --define "_sourcedir $(SOURCES)" --define "_builddir $(RPM)/BUILD" --define "_srcrpmdir $(RPM)/SRPMS" --define "_rpmdir $(RPM)/RPMS" --define "_specdir $(RPM)/SPECS" --define "dist $(DIST)" $(RPMBUILDOPTS) $(RPM)/SOURCES/$(PACKAGE_NAME).spec
@@ -306,9 +312,9 @@ dist-all-rpms: dist-sources do-rpmbuild
dist-srpm: RPMBUILDOPTS=--nodeps -bs
dist-srpm: dist-sources do-rpmbuild
-dist-srpm-gcov: BUILDID=".gcov"
-dist-srpm-gcov: BUILDOPTS+="+gcov"
-dist-srpm-gcov: dist-srpm
+dist-srpm-%: dist-srpm
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
dist-rpms: RPMBUILDOPTS=--target $(MACH) -bb
dist-rpms: dist-sources do-rpmbuild
@@ -322,8 +328,7 @@ dist-prep: dist-sources do-rpmbuild
dist-perf: RPMBUILDOPTS=--without up --without smp --without zfcpdump --without debug --without doc --without headers --without --without doc --without debuginfo --target $(MACH) -bb
dist-perf: dist-sources do-rpmbuild
-dist-rpm-baseonly: RPMBUILDOPTS=--target $(MACH) --without debug --without debuginfo --without vdso_install --without bpftool --without perf --without tools -bb
-dist-rpm-baseonly: dist-sources do-rpmbuild
+dist-rpm-%: dist-sources do-rpmbuild
# unless you know what you're doing, you don't want to use the next four ones
dist-release-finish: setup-source
@@ -388,9 +393,25 @@ distg-koji: BUILD_FLAGS ?= $(KOJI_FLAGS) $(TEST_FLAGS)
dist-brew dist-koji: dist-%: dist-srpm
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) $(SRPMS)/$(PACKAGE_NAME)-$(KVERSION)-$(PKGRELEASE)$(DIST).src.rpm $(OUTPUT_FILE)
+dist-brew-%: dist-brew
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
+dist-koji-%: dist-koji
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
distg-brew distg-koji: distg-%:
$* $(BUILD_PROFILE) build $(BUILD_FLAGS) $(BUILD_TARGET) "$(RHGITURL)?redhat/koji#$(RHGITCOMMIT)"
+distg-brew-%: dist-brew
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
+distg-koji-%: dist-koji
+ @# phony command to force this to be a target and not variable
+ @FOO=BAR
+
.PHONY: $(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec
$(REDHAT)/rpm/SOURCES/$(PACKAGE_NAME).spec:
@echo "dist-sources"
@@ -469,34 +490,30 @@ dist-full-help:
@echo 'Building targets:'
@echo ' All RPM/SRPM files will be put under the redhat/rpm/ directory.'
@echo ''
- @echo ' dist-srpm - Create a source RPM and put it into the redhat/rpm/SRPMS/'
+ @echo ' dist-srpm@ - Create a source RPM and put it into the redhat/rpm/SRPMS/'
@echo ' directory. See the dist-brew target for available options.'
- @echo ' dist-srpm-gcov - Create a source RPM with gcov enabled and put it into the'
- @echo ' redhat/rpm/SRPMS/ directory.'
- @echo ' dist-brew - Create a kernel SRPM and then call brew to build the'
+ @echo ' dist-brew@ - Create a kernel SRPM and then call brew to build the'
@echo ' created SRPM. Add BUILDOPTS="+<opt> -<opt> [...]" to'
@echo ' enable/disable build options.'
@echo ' Available <opt>s and their default values:' \
$$(sed -n -e 's/^%define with_\([^ \t]*\).*\?_without_.*/+\1/p' \
-e 's/^%define with_\([^ \t]*\).*\?_with_.*/-\1/p' kernel.spec.template | \
grep -v 'only$$') | fmt -80
- @echo ' dist-koji - Create a kernel SRPM and then call koji to build the'
+ @echo ' dist-koji@ - Create a kernel SRPM and then call koji to build the'
@echo ' created SRPM. See the dist-brew target for available'
@echo ' options.'
- @echo ' distg-brew - Pass HEAD of the current git branch to brew to build an'
+ @echo ' distg-brew@ - Pass HEAD of the current git branch to brew to build an'
@echo ' RPM set. Do not forget to push to the remote repository'
@echo ' first. Preceed make command by RHGITCOMMIT=<commitID>'
@echo ' specify commit ID to use.'
@echo ' To set the remote repo, invoke:'
@echo ' git config rhg.url git://<repo_path>'
- @echo ' distg-koji - Pass HEAD of the current git branch to koji to build an'
+ @echo ' distg-koji@ - Pass HEAD of the current git branch to koji to build an'
@echo ' RPM set. Do not forget to push to the remote repository'
@echo ' first. See the distg-brew target for options and'
@echo ' configuration.'
- @echo ' dist-rpms - Create the binary RPMS for the kernel.'
+ @echo ' dist-rpms@ - Create the binary RPMS for the kernel.'
@echo ' See the dist-brew target for available options.'
- @echo ' dist-rpm-baseonly - Create the binary RPMS for the kernel and modules'
- @echo ' (no userspace tools or debuginfo).'
@echo ' dist-kernel-<type> - Create binary RPMS for a particular kernel type.'
@echo ' Available <type>s:'\
$$(sed -n 's/^%define with_\([^ ]*only\).*/\1/p' kernel.spec.template)
@@ -524,6 +541,12 @@ dist-full-help:
@echo ' dist-rhel-configs - build ELN configs'
@echo ' dist-fedora-configs - build Fedora configs'
+ @echo ''
+ @echo 'Wildcard targets: [indicated by '@' above]'
+ @echo ' *-baseonly - builds only the kernel (disables userspace and debuginfo)'
+ @echo ' - Examples: dist-srpm-baseonly, dist-brew-baseonly'
+ @echo ' *-gcov - builds a kernel with gcov enabled'
+ @echo ' - Examples: dist-srpm-gcov, dist-brew-gcov'
@echo ''
@echo 'kABI targets:'
@echo ' dist-kabi - Create kABI stablelist files in redhat/kabi/kabi-rhel*/'
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1444
From: Sabrina Dubroca on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1619
This MR introduces a new kABI macro, RH_KABI_EXCLUDE_WITH_SIZE. The
implementation is identical to RH_KABI_EXTEND_WITH_SIZE, but the meaning is
more in line with RH_KABI_EXCLUDE. The size check and reserved space allows us
to exclude an element embedded inside a kABI-protected structure while
reserving space for it to grow in the future.
The size checks that are part of multiple kABI macros are currently not
enabled because the config option to turn them on is missing. Those size
checks only make sense on regular builds, so they're disabled on debug
kernels.
Signed-off-by: Sabrina Dubroca <sdubroca(a)redhat.com>
---
include/linux/rh_kabi.h | 26 ++++++++++
redhat/configs/ark/debug/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
redhat/configs/ark/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
redhat/configs/ark/kgcov/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
redhat/configs/common/generic/CONFIG_RH_KABI_SIZE_ALIGN_CHECKS | 1 +
Kconfig.redhat | 9 +++
6 files changed, 39 insertions(+), 0 deletions(-)
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2606
There are two significant problems with the existing hardware and driver
maintenance process. It is not easy to determine if a driver or piece of
hardware is supported, and it is not easy to determine if a driver or piece of
hardware is deprecated.
This changeset implements new 'centralized' call points to mark hardware and
devices deprecated, unmaintained, or disabled. This removes per-driver code
and reduces the amount of RHEL only code in the kernel.
It is easiest to look at a comparison of the old and new processes. In this
example, I will look at disabling a PCI card. In the old process, a bugzilla
would be opened to mark the device as disabled, and it would be assigned to an
engineer. That engineer would submit code and it would eventually be merged
into the tree. The problem with this process is that it does not make it easy
for others to determine the status of the device without examining the code.
This led to situations where devices were assumed to be supported in RHEL9 but
were not actually enabled. In addition to this, this process required
per-driver changes which were spread throughout the kernel.
The new process relies on a database that contains information on the status
of
a device. In order to disable a device the database must first be updated with
the information. The database contains a utility to update the code which is
then directly copied into the kernel as a Merge Request.
As part of this change, the code is updated to have two main calling points to
examine devices and drivers. The kernel module loading code is updated to
check the status of a driver before loading it, and the PCI core driver code
was updated to to check the status of a device before binding it to a driver.
There is dead and existing code that is removed from the source code before
any
changes are made.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
drivers/message/fusion/mptsas.c | 5 -
drivers/message/fusion/mptspi.c | 5 -
drivers/pci/pci-driver.c | 83 +--------
include/linux/kernel.h | 9 +-
include/linux/module.h | 4 +
include/linux/pci.h | 19 +-
init/main.c | 3 +
kernel/module/main.c | 5 +
kernel/rh_messages.c | 343 +++++++++++++++++++++++++++++++--------
kernel/rh_messages.h | 109 ++++++++++++
10 files changed, 406 insertions(+), 179 deletions(-)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Enable CONFIG_EXPERT for both RHEL and Fedora
With CONFIG_EXPERT disabled, we have had instances of things changing
underneath without our knowledge. This is evident where we had config
items specifically set, but they are ignored because the item is now
dependent upon CONFIG_EXPERT. It is time to enable CONFIG_EXPERT to
ensure that we know exactly how our configs are built.
Additionally, RT is hidden behind CONFIG_EXPERT as well, so RHEL
developers already had to ensure that configs dependent upon expert were
set correctly for both x86 and aarch64. This should make things a bit
easier in that regard since EXPERT is now set everywhere.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS b/redhat/configs/common/generic/CONFIG_ADVISE_SYSCALLS
rename from redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS
rename to redhat/configs/common/generic/CONFIG_ADVISE_SYSCALLS
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ADVISE_SYSCALLS
+++ b/redhat/configs/common/generic/CONFIG_ADVISE_SYSCALLS
diff --git a/redhat/configs/rhel/generic/CONFIG_AIO b/redhat/configs/common/generic/CONFIG_AIO
rename from redhat/configs/rhel/generic/CONFIG_AIO
rename to redhat/configs/common/generic/CONFIG_AIO
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_AIO
+++ b/redhat/configs/common/generic/CONFIG_AIO
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP b/redhat/configs/common/generic/CONFIG_ALLOW_DEV_COREDUMP
rename from redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP
rename to redhat/configs/common/generic/CONFIG_ALLOW_DEV_COREDUMP
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ALLOW_DEV_COREDUMP
+++ b/redhat/configs/common/generic/CONFIG_ALLOW_DEV_COREDUMP
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS b/redhat/configs/common/generic/CONFIG_ARCH_MMAP_RND_BITS
rename from redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS
rename to redhat/configs/common/generic/CONFIG_ARCH_MMAP_RND_BITS
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_BITS
+++ b/redhat/configs/common/generic/CONFIG_ARCH_MMAP_RND_BITS
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS b/redhat/configs/common/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
rename from redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
rename to redhat/configs/common/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
+++ b/redhat/configs/common/generic/CONFIG_ARCH_MMAP_RND_COMPAT_BITS
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE b/redhat/configs/common/generic/CONFIG_ATA_FORCE
rename from redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE
rename to redhat/configs/common/generic/CONFIG_ATA_FORCE
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ATA_FORCE
+++ b/redhat/configs/common/generic/CONFIG_ATA_FORCE
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM b/redhat/configs/common/generic/CONFIG_ATH9K_PCOEM
rename from redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM
rename to redhat/configs/common/generic/CONFIG_ATH9K_PCOEM
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_PCOEM
+++ b/redhat/configs/common/generic/CONFIG_ATH9K_PCOEM
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL b/redhat/configs/common/generic/CONFIG_ATH9K_RFKILL
rename from redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL
rename to redhat/configs/common/generic/CONFIG_ATH9K_RFKILL
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_ATH9K_RFKILL
+++ b/redhat/configs/common/generic/CONFIG_ATH9K_RFKILL
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL b/redhat/configs/common/generic/CONFIG_BASE_FULL
rename from redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL
rename to redhat/configs/common/generic/CONFIG_BASE_FULL
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_BASE_FULL
+++ b/redhat/configs/common/generic/CONFIG_BASE_FULL
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_BLOCK b/redhat/configs/common/generic/CONFIG_BLOCK
rename from redhat/configs/rhel/rt/generic/CONFIG_BLOCK
rename to redhat/configs/common/generic/CONFIG_BLOCK
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_BLOCK
+++ b/redhat/configs/common/generic/CONFIG_BLOCK
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_BUG b/redhat/configs/common/generic/CONFIG_BUG
rename from redhat/configs/common/generic/arm/aarch64/CONFIG_BUG
rename to redhat/configs/common/generic/CONFIG_BUG
index blahblah..blahblah 100644
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_BUG
+++ b/redhat/configs/common/generic/CONFIG_BUG
diff --git a/redhat/configs/rhel/generic/CONFIG_CACHESTAT_SYSCALL b/redhat/configs/common/generic/CONFIG_CACHESTAT_SYSCALL
rename from redhat/configs/rhel/generic/CONFIG_CACHESTAT_SYSCALL
rename to redhat/configs/common/generic/CONFIG_CACHESTAT_SYSCALL
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/generic/CONFIG_CACHESTAT_SYSCALL
+++ b/redhat/configs/common/generic/CONFIG_CACHESTAT_SYSCALL
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS b/redhat/configs/common/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
rename from redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
rename to redhat/configs/common/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
+++ b/redhat/configs/common/generic/CONFIG_CFG80211_CERTIFICATION_ONUS
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT b/redhat/configs/common/generic/CONFIG_CFG80211_CRDA_SUPPORT
rename from redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT
rename to redhat/configs/common/generic/CONFIG_CFG80211_CRDA_SUPPORT
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_CFG80211_CRDA_SUPPORT
+++ b/redhat/configs/common/generic/CONFIG_CFG80211_CRDA_SUPPORT
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS b/redhat/configs/common/generic/CONFIG_CONSOLE_TRANSLATIONS
rename from redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS
rename to redhat/configs/common/generic/CONFIG_CONSOLE_TRANSLATIONS
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_CONSOLE_TRANSLATIONS
+++ b/redhat/configs/common/generic/CONFIG_CONSOLE_TRANSLATIONS
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_COREDUMP b/redhat/configs/common/generic/CONFIG_COREDUMP
rename from redhat/configs/rhel/rt/generic/CONFIG_COREDUMP
rename to redhat/configs/common/generic/CONFIG_COREDUMP
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_COREDUMP
+++ b/redhat/configs/common/generic/CONFIG_COREDUMP
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_BUGVERBOSE b/redhat/configs/common/generic/CONFIG_DEBUG_BUGVERBOSE
rename from redhat/configs/rhel/rt/generic/CONFIG_DEBUG_BUGVERBOSE
rename to redhat/configs/common/generic/CONFIG_DEBUG_BUGVERBOSE
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_BUGVERBOSE
+++ b/redhat/configs/common/generic/CONFIG_DEBUG_BUGVERBOSE
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B b/redhat/configs/common/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B
rename from redhat/configs/rhel/rt/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B
rename to redhat/configs/common/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B
+++ b/redhat/configs/common/generic/CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_MEMORY_INIT b/redhat/configs/common/generic/CONFIG_DEBUG_MEMORY_INIT
rename from redhat/configs/rhel/rt/generic/CONFIG_DEBUG_MEMORY_INIT
rename to redhat/configs/common/generic/CONFIG_DEBUG_MEMORY_INIT
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_MEMORY_INIT
+++ b/redhat/configs/common/generic/CONFIG_DEBUG_MEMORY_INIT
diff --git a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_RSEQ b/redhat/configs/common/generic/CONFIG_DEBUG_RSEQ
rename from redhat/configs/rhel/rt/generic/CONFIG_DEBUG_RSEQ
rename to redhat/configs/common/generic/CONFIG_DEBUG_RSEQ
index blahblah..blahblah 100644
--- a/redhat/configs/rhel/rt/generic/CONFIG_DEBUG_RSEQ
+++ b/redhat/configs/common/generic/CONFIG_DEBUG_RSEQ
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2612
From: Scott Mayhew <smayhew(a)redhat.com>
redhat/configs: update CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST is enabled in both RHEL and Fedora, so
move it to configs/common.
Signed-off-by: Scott Mayhew <smayhew(a)redhat.com>
diff --git a/redhat/configs/fedora/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST b/redhat/configs/common/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
rename from redhat/configs/fedora/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
rename to redhat/configs/common/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
index blahblah..blahblah 100644
--- a/redhat/configs/fedora/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
+++ b/redhat/configs/common/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
diff --git a/redhat/configs/rhel/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST b/redhat/configs/rhel/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/rhel/generic/CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2478
From: Don Zickus on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2519
This change uses the update git push changes for ark-create-release.sh. The
behavior moves the git push for gitlab-ci.yml to the script itself. No
expected behavior fallout, but there are some odd legacy cases that may cause
a subtle change.
Dependent on part2.
Signed-off-by: Don Zickus <dzickus(a)redhat.com>
---
redhat/scripts/ci/ark-ci-env.sh | 30 +++++++++++
redhat/scripts/ci/ark-create-release.sh | 74 +++++++++++-----------------
redhat/scripts/ci/ark-update-configs.sh | 85 ++++++++++++++++++--------------
.gitlab-ci.yml | 12 +----
4 files changed, 108 insertions(+), 93 deletions(-)
From: Patrick Talbert <ptalbert(a)redhat.com>
[redhat] New configs in drivers/watchdog
12984cea1b8c5 ('watchdog: xilinx_wwdt: Add Versal window watchdog support')
adds a new config option CONFIG_XILINX_WINDOW_WATCHDOG:
~~~
config XILINX_WINDOW_WATCHDOG
tristate "Xilinx window watchdog timer"
depends on HAS_IOMEM
depends on ARM64
select WATCHDOG_CORE
help
Window watchdog driver for the versal_wwdt IP core.
Window watchdog timer(WWDT) contains closed(first) and
open(second) window with 32 bit width. Write to the watchdog
timer within predefined window periods of time. This means
a period that is not too soon and a period that is not too
late. The WWDT has to be restarted within the open window time.
If software tries to restart WWDT outside of the open window
time period, it generates a reset.
To compile this driver as a module, choose M here: the
module will be called xilinx_wwdt.
~~~
Set it as disabled.
Signed-off-by: Patrick Talbert <ptalbert(a)redhat.com>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_XILINX_WINDOW_WATCHDOG b/redhat/configs/rhel/generic/CONFIG_XILINX_WINDOW_WATCHDOG
rename from redhat/configs/pending-rhel/generic/CONFIG_XILINX_WINDOW_WATCHDOG
rename to redhat/configs/rhel/generic/CONFIG_XILINX_WINDOW_WATCHDOG
index blahblah..blahblah 100644
--- a/redhat/configs/pending-rhel/generic/CONFIG_XILINX_WINDOW_WATCHDOG
+++ b/redhat/configs/rhel/generic/CONFIG_XILINX_WINDOW_WATCHDOG
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2594
From: Scott Weaver on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2606
There are two significant problems with the existing hardware and driver
maintenance process. It is not easy to determine if a driver or piece of
hardware is supported, and it is not easy to determine if a driver or piece of
hardware is deprecated.
This changeset implements new 'centralized' call points to mark hardware and
devices deprecated, unmaintained, or disabled. This removes per-driver code
and reduces the amount of RHEL only code in the kernel.
It is easiest to look at a comparison of the old and new processes. In this
example, I will look at disabling a PCI card. In the old process, a bugzilla
would be opened to mark the device as disabled, and it would be assigned to an
engineer. That engineer would submit code and it would eventually be merged
into the tree. The problem with this process is that it does not make it easy
for others to determine the status of the device without examining the code.
This led to situations where devices were assumed to be supported in RHEL9 but
were not actually enabled. In addition to this, this process required
per-driver changes which were spread throughout the kernel.
The new process relies on a database that contains information on the status
of
a device. In order to disable a device the database must first be updated with
the information. The database contains a utility to update the code which is
then directly copied into the kernel as a Merge Request.
As part of this change, the code is updated to have two main calling points to
examine devices and drivers. The kernel module loading code is updated to
check the status of a driver before loading it, and the PCI core driver code
was updated to to check the status of a device before binding it to a driver.
There is dead and existing code that is removed from the source code before
any
changes are made.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
Signed-off-by: Scott Weaver <scweaver(a)redhat.com>
---
drivers/message/fusion/mptsas.c | 5 -
drivers/message/fusion/mptspi.c | 1 -
drivers/pci/pci-driver.c | 83 +--------
include/linux/kernel.h | 9 +-
include/linux/module.h | 4 +
include/linux/pci.h | 19 +-
init/main.c | 3 +
kernel/module/main.c | 5 +
kernel/rh_messages.c | 343 +++++++++++++++++++++++++++++++--------
kernel/rh_messages.h | 109 ++++++++++++
10 files changed, 406 insertions(+), 175 deletions(-)