[OS-BUILD PATCH] Fix branch creation for releases based on tags
by GitLab Bridge on behalf of jeremycline
From: Jeremy Cline <jcline(a)redhat.com>
The release scripts are supposed create a set of branches if the release
is based of a tag rather than a snapshot. davidlt noted on IRC that
branches were missing for recent tags, namely rc3 and rc4. The reason is
that the check for a signed tag expects $UPSTREAM_REF to be the tag.
Resolve $UPSTREAM_REF to a tag (if it exists) prior to verifying the
tag.
Signed-off-by: Jeremy Cline <jcline(a)redhat.com>
---
redhat/scripts/ci/ark-create-release.sh | 2 +-
redhat/scripts/ci/ark-rebase-patches.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh
index fd57e533ddb4..83b102ceb54f 100755
--- a/redhat/scripts/ci/ark-create-release.sh
+++ b/redhat/scripts/ci/ark-create-release.sh
@@ -37,7 +37,7 @@ git checkout os-build
git checkout os-build
./redhat/scripts/ci/ark-update-configs.sh "$UPSTREAM_REF" "$PROJECT_ID"
-if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
+if git tag -v "$(git describe --exact-match "$UPSTREAM_REF")"; then
git checkout -b ark/"$UPSTREAM_REF" ark/patches/"$UPSTREAM_REF"
RELEASE_BRANCHES=" ark/$UPSTREAM_REF ark/patches/$UPSTREAM_REF"
else
diff --git a/redhat/scripts/ci/ark-rebase-patches.sh b/redhat/scripts/ci/ark-rebase-patches.sh
index 2ac22bcba3bd..4a02176bde88 100755
--- a/redhat/scripts/ci/ark-rebase-patches.sh
+++ b/redhat/scripts/ci/ark-rebase-patches.sh
@@ -102,7 +102,7 @@ else
exit 2
fi
-if git tag -v "$UPSTREAM_REF" > /dev/null 2>&1; then
+if git tag -v "$(git describe --exact-match "$UPSTREAM_REF")"; then
printf "Creating branch \"ark/patches/%s\"\n" "$UPSTREAM_REF"
git branch ark/patches/"$UPSTREAM_REF"
printf "Don't forget to run 'git push <remote> ark/patches/%s'\n" "$UPSTREAM_REF"
--
2.26.2
2 days, 21 hours
[OS-BUILD PATCH] [redhat] Add GIT macro to Makefile and
Makefile.common:
by GitLab Bridge on behalf of bcrocker
From: Ben Crocker <bcrocker(a)redhat.com>
GIT ?= git
and replace literal occurrences of 'git' with $(GIT).
This change enables us to override 'git' with, e.g., some
arbitrary shell script that prints additional information
and/or does additional processing before and/or after (or
even instead of) invoking /usr/bin/git.
Signed-off-by: Ben Crocker <bcrocker(a)redhat.com>
---
redhat/Makefile | 29 +++++++++++++++--------------
redhat/Makefile.common | 16 ++++++++--------
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/redhat/Makefile b/redhat/Makefile
index 27d2cd94e78f..ee3702434e05 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -1,3 +1,4 @@
+GIT ?= git
include Makefile.common
include Makefile.rhpkg
@@ -32,8 +33,8 @@ endif
BUILD_TARGET ?= --scratch $(BUILD_SCRATCH_TARGET)
FLAVOR =
-RHGITURL?=$(shell git config rhg.url || git config remote.origin.url)
-RHGITCOMMIT?=$(shell git log -1 --pretty=format:%H)
+RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
+RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)
# this section is needed in order to make O= to work
_OUTPUT := ..
@@ -199,7 +200,7 @@ $(KABIDW_TARBALL):
dist-git-version-check:
@# genspec.sh uses pathspec magic that wasn't introduced until version 2.13
@IFS=" ."; \
- set -- $$(git --version); \
+ set -- $$($(GIT) --version); \
IFS=; \
if [ "$$3" -lt 2 -o \( "$$3" -eq 2 -a "$$4" -lt 13 \) ]; then \
echo "ERROR: You need git version 2.13 or newer to run some setup commands"; \
@@ -219,7 +220,7 @@ setup-source: dist-git-version-check dist-clean-sources
sources-rh: $(TARBALL)
@cp -l $(TARBALL) $(SOURCES)/ || cp $(TARBALL) $(SOURCES)/
@touch $(TESTPATCH)
- @git diff --no-renames HEAD > $(TESTPATCH).tmp
+ @$(GIT) diff --no-renames HEAD > $(TESTPATCH).tmp
@# 1) filterdiff will return crap from the patches it just filtered,
@# that's why egrep is needed so if there're changes under redhat/
@# but not everywhere else, it will be empty just like
@@ -265,7 +266,7 @@ sources-rh: $(TARBALL)
dist-sources: setup-source dist-configs-check dist-kabi dist-kabi-dup sources-rh
dist-test-patch:
- @git diff --no-renames HEAD > $(TESTPATCH);
+ @$(GIT) diff --no-renames HEAD > $(TESTPATCH);
@($(FILTERDIFF) $(TESTPATCH) | egrep -v "^index|^diff" >$(TESTPATCH).tmp; true)
@mv $(TESTPATCH).tmp $(TESTPATCH);
@@ -300,34 +301,34 @@ dist-release-finish: setup-source
@cp $(SOURCES)/$(CHANGELOG) $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@# if neither changelog nor marker was updated, skip bumping a release
- git diff-index --quiet HEAD && (echo "Nothing changed, skipping updates"; exit 0) || true
+ $(GIT) diff-index --quiet HEAD && (echo "Nothing changed, skipping updates"; exit 0) || true
$(REDHAT)/scripts/new_release.sh $(REDHAT) $(__YSTREAM) $(__ZSTREAM); \
- git add $(REDHAT)/$(CHANGELOG); \
- git add $(REDHAT)/marker; \
- git commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"; \
+ $(GIT) add $(REDHAT)/$(CHANGELOG); \
+ $(GIT) add $(REDHAT)/marker; \
+ $(GIT) commit -s ../Makefile.rhelver $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"; \
dist-release: dist-clean-sources
@$(MAKE) dist-release-finish
dist-release-tag:
- @git tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
+ @$(GIT) tag -a -m "$(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)" $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PKGRELEASE)
git-tree-check:
- @if test -n "$(DIST_PUSH)" && test -z "$(shell git remote get-url gitlab 2>/dev/null)"; then \
+ @if test -n "$(DIST_PUSH)" && test -z "$(shell $(GIT) remote get-url gitlab 2>/dev/null)"; then \
echo -e "Please run 'git remote add gitlab <url>' to enable git-push.\n"; \
exit 1; \
fi
- @git diff-index --quiet HEAD || \
+ @$(GIT) diff-index --quiet HEAD || \
{ echo -e "Dirty tree, please clean before merging.\n"; exit 1; }
DIST_BRANCH ?= "os-build"
dist-merge-upstream: git-tree-check
- @if test "$(shell git branch --show-current)" != "$(DIST_BRANCH)"; then \
+ @if test "$(shell $(GIT) branch --show-current)" != "$(DIST_BRANCH)"; then \
echo -e "Please checkout $(DIST_BRANCH) branch before merging.\n"; \
exit 1; \
fi;
@# If TAG is empty, script defaults to master:HEAD
- git checkout $(DIST_BRANCH)
+ $(GIT) checkout $(DIST_BRANCH)
@$(REDHAT)/scripts/ci/ark-update-configs.sh $(TAG)
dist-merge-upstream-push: export DIST_PUSH="1"
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index b335f3c77c7d..80c3b8dfccd4 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -1,4 +1,4 @@
-TOPDIR:=$(shell git rev-parse --show-toplevel)
+TOPDIR:=$(shell $(GIT) rev-parse --show-toplevel)
REDHAT:=$(TOPDIR)/redhat
include $(TOPDIR)/Makefile.rhelver
@@ -6,11 +6,11 @@ RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
MACH := $(shell uname -m)
-RPMKVERSION:=$(shell git show HEAD:Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')
-RPMKPATCHLEVEL:=$(shell git show HEAD:Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')
-RPMKSUBLEVEL:=$(shell git show HEAD:Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}')
-RPMKEXTRAVERSION:=$(shell git show HEAD:Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}')
-GITID:= $(shell git log --max-count=1 --pretty=format:%H)
+RPMKVERSION:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}')
+RPMKPATCHLEVEL:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}')
+RPMKSUBLEVEL:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}')
+RPMKEXTRAVERSION:=$(shell $(GIT) show HEAD:Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}')
+GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H)
# marker is git tag which we base off of for exporting patches
# Make sure marker uses RPMKPATCHLEVEL and RPMKEXTRAVERSION from the kernel
# makefile as opposed to any adjusted version for snapshotting.
@@ -42,8 +42,8 @@ else
endif
ifeq ($(VERSION_ON_UPSTREAM),1)
# master is expected to track mainline.
- MERGE_BASE:=$(shell git merge-base HEAD master)
- _TAG:=$(shell git describe $(MERGE_BASE))
+ MERGE_BASE:=$(shell $(GIT) merge-base HEAD master)
+ _TAG:=$(shell $(GIT) describe $(MERGE_BASE))
# a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
else
--
GitLab
5 days, 16 hours
[OS-BUILD PATCH] [redhat] New configs in drivers/bus
by GitLab Bridge on behalf of jeremycline
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
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_VEXPRESS_CONFIG:
Platform configuration infrastructure for the ARM Ltd.
Versatile Express.
Symbol: VEXPRESS_CONFIG [=y]
Type : tristate
Defined at drivers/bus/Kconfig:224
Prompt: Versatile Express configuration bus
Depends on: (ARM || ARM64 [=y]) && OF [=y]
Location:
-> Device Drivers
-> Bus devices
Selects: REGMAP [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_VEXPRESS_CONFIG | 1 +
.../generic/CONFIG_VEXPRESS_CONFIG | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_VEXPRESS_CONFIG
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_VEXPRESS_CONFIG
diff --git a/redhat/configs/common/generic/CONFIG_VEXPRESS_CONFIG b/redhat/configs/common/generic/CONFIG_VEXPRESS_CONFIG
new file mode 100644
index 000000000000..389660309f56
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_VEXPRESS_CONFIG
@@ -0,0 +1 @@
+CONFIG_VEXPRESS_CONFIG=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_VEXPRESS_CONFIG b/redhat/configs/pending-common/generic/CONFIG_VEXPRESS_CONFIG
deleted file mode 100644
index a2c1cb307e90..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_VEXPRESS_CONFIG
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_VEXPRESS_CONFIG:
-#
-# Platform configuration infrastructure for the ARM Ltd.
-# Versatile Express.
-#
-# Symbol: VEXPRESS_CONFIG [=y]
-# Type : tristate
-# Defined at drivers/bus/Kconfig:224
-# Prompt: Versatile Express configuration bus
-# Depends on: (ARM || ARM64 [=y]) && OF [=y]
-# Location:
-# -> Device Drivers
-# -> Bus devices
-# Selects: REGMAP [=y]
-#
-#
-#
-CONFIG_VEXPRESS_CONFIG=y
--
2.26.2
1 week
[OS-BUILD PATCH] [redhat] New configs in fs/nfs
by GitLab Bridge on behalf of redhat-patchlab
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
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_NFS_V4_2_READ_PLUS:
This is intended for developers only. The READ_PLUS operation has
been shown to have issues under specific conditions and should not
be used in production.
Symbol: NFS_V4_2_READ_PLUS [=n]
Type : bool
Defined at fs/nfs/Kconfig:209
Prompt: NFS: Enable support for the NFSv4.2 READ_PLUS operation
Depends on: NETWORK_FILESYSTEMS [=y] && NFS_V4_2 [=y]
Location:
-> File systems
-> Network File Systems (NETWORK_FILESYSTEMS [=y])
---
Cc: kernel-patches(a)redhat.com
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_NFS_V4_2_READ_PLUS | 1 +
.../generic/CONFIG_NFS_V4_2_READ_PLUS | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_NFS_V4_2_READ_PLUS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_NFS_V4_2_READ_PLUS
diff --git a/redhat/configs/common/generic/CONFIG_NFS_V4_2_READ_PLUS b/redhat/configs/common/generic/CONFIG_NFS_V4_2_READ_PLUS
new file mode 100644
index 000000000000..4d62001f1f91
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_NFS_V4_2_READ_PLUS
@@ -0,0 +1 @@
+# CONFIG_NFS_V4_2_READ_PLUS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_NFS_V4_2_READ_PLUS b/redhat/configs/pending-common/generic/CONFIG_NFS_V4_2_READ_PLUS
deleted file mode 100644
index 5a90e4f7db16..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_NFS_V4_2_READ_PLUS
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_NFS_V4_2_READ_PLUS:
-#
-# This is intended for developers only. The READ_PLUS operation has
-# been shown to have issues under specific conditions and should not
-# be used in production.
-#
-# Symbol: NFS_V4_2_READ_PLUS [=n]
-# Type : bool
-# Defined at fs/nfs/Kconfig:209
-# Prompt: NFS: Enable support for the NFSv4.2 READ_PLUS operation
-# Depends on: NETWORK_FILESYSTEMS [=y] && NFS_V4_2 [=y]
-# Location:
-# -> File systems
-# -> Network File Systems (NETWORK_FILESYSTEMS [=y])
-#
-#
-#
-# CONFIG_NFS_V4_2_READ_PLUS is not set
--
GitLab
1 week, 2 days
[OS-BUILD PATCH] [redhat] New configs in drivers/rtc
by GitLab Bridge on behalf of redhat-patchlab
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
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_RTC_DRV_GOLDFISH:
Say yes to enable RTC driver for the Goldfish based virtual platform.
Goldfish is a code name for the virtual platform developed by Google
for Android emulation.
Symbol: RTC_DRV_GOLDFISH [=n]
Type : tristate
Defined at drivers/rtc/Kconfig:1943
Prompt: Goldfish Real Time Clock
Depends on: RTC_CLASS [=y] && OF [=y] && HAS_IOMEM [=y]
Location:
-> Device Drivers
-> Real Time Clock (RTC_CLASS [=y])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_RTC_DRV_GOLDFISH | 1 +
.../generic/CONFIG_RTC_DRV_GOLDFISH | 19 -------------------
2 files changed, 1 insertion(+), 19 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_RTC_DRV_GOLDFISH
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_RTC_DRV_GOLDFISH
diff --git a/redhat/configs/common/generic/CONFIG_RTC_DRV_GOLDFISH b/redhat/configs/common/generic/CONFIG_RTC_DRV_GOLDFISH
new file mode 100644
index 000000000000..4b7e561b61de
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_RTC_DRV_GOLDFISH
@@ -0,0 +1 @@
+# CONFIG_RTC_DRV_GOLDFISH is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_RTC_DRV_GOLDFISH b/redhat/configs/pending-common/generic/CONFIG_RTC_DRV_GOLDFISH
deleted file mode 100644
index cfb8193b9bb0..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_RTC_DRV_GOLDFISH
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_RTC_DRV_GOLDFISH:
-#
-# Say yes to enable RTC driver for the Goldfish based virtual platform.
-#
-# Goldfish is a code name for the virtual platform developed by Google
-# for Android emulation.
-#
-# Symbol: RTC_DRV_GOLDFISH [=n]
-# Type : tristate
-# Defined at drivers/rtc/Kconfig:1943
-# Prompt: Goldfish Real Time Clock
-# Depends on: RTC_CLASS [=y] && OF [=y] && HAS_IOMEM [=y]
-# Location:
-# -> Device Drivers
-# -> Real Time Clock (RTC_CLASS [=y])
-#
-#
-#
-# CONFIG_RTC_DRV_GOLDFISH is not set
--
GitLab
1 week, 2 days
[OS-BUILD PATCH] [redhat] New configs in drivers/extcon
by GitLab Bridge on behalf of redhat-patchlab
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
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_EXTCON_USBC_TUSB320:
Say Y here to enable support for USB Type C cable detection extcon
support using a TUSB320.
Symbol: EXTCON_USBC_TUSB320 [=n]
Type : tristate
Defined at drivers/extcon/Kconfig:189
Prompt: TI TUSB320 USB-C extcon support
Depends on: EXTCON [=y] && I2C [=y]
Location:
-> Device Drivers
-> External Connector Class (extcon) support (EXTCON [=y])
Selects: REGMAP_I2C [=m]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_EXTCON_USBC_TUSB320 | 1 +
.../generic/CONFIG_EXTCON_USBC_TUSB320 | 18 ------------------
2 files changed, 1 insertion(+), 18 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320
diff --git a/redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320 b/redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320
new file mode 100644
index 000000000000..4eedae83091b
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_EXTCON_USBC_TUSB320
@@ -0,0 +1 @@
+# CONFIG_EXTCON_USBC_TUSB320 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320 b/redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320
deleted file mode 100644
index 74b8e5ac1d0d..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_EXTCON_USBC_TUSB320
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_EXTCON_USBC_TUSB320:
-#
-# Say Y here to enable support for USB Type C cable detection extcon
-# support using a TUSB320.
-#
-# Symbol: EXTCON_USBC_TUSB320 [=n]
-# Type : tristate
-# Defined at drivers/extcon/Kconfig:189
-# Prompt: TI TUSB320 USB-C extcon support
-# Depends on: EXTCON [=y] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> External Connector Class (extcon) support (EXTCON [=y])
-# Selects: REGMAP_I2C [=m]
-#
-#
-#
-# CONFIG_EXTCON_USBC_TUSB320 is not set
--
GitLab
1 week, 3 days
[OS-BUILD PATCH] [redhat] New configs in sound/soc
by CKI Gitlab (via Email Bridge)
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in sound/soc
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_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK:
This adds support for SoundWire with Sound Open Firmware
for Intel(R) platforms.
Say Y if you want to enable SoundWire links with SOF.
If unsure select "N".
Symbol: SND_SOC_SOF_INTEL_SOUNDWIRE_LINK [=n]
Type : bool
Defined at sound/soc/sof/intel/Kconfig:356
Prompt: SOF support for SoundWire
Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_SOF_TOPLEVEL [=y] && SND_SOC_SOF_INTEL_TOPLEVEL [=y] && SND_SOC_SOF_INTEL_PCI [=m] && ACPI [=y]
Location:
-> Device Drivers
-> Sound card support (SOUND [=m])
-> Advanced Linux Sound Architecture (SND [=m])
-> ALSA for SoC audio support (SND_SOC [=m])
-> Sound Open Firmware Support (SND_SOC_SOF_TOPLEVEL [=y])
-> SOF support for Intel audio DSPs (SND_SOC_SOF_INTEL_TOPLEVEL [=y])
---
Cc: Jaroslav Kysela <jkysela(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff a/redhat/configs/common/generic/CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK b/redhat/configs/common/generic/CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
@@ -0,0 +1 @@
+# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set
diff a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK b/redhat/configs/pending-common/generic/CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
--- a/redhat/configs/pending-common/generic/CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK
+++ /dev/null
@@ -1,23 +0,0 @@
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK:
-#
-# This adds support for SoundWire with Sound Open Firmware
-# for Intel(R) platforms.
-# Say Y if you want to enable SoundWire links with SOF.
-# If unsure select "N".
-#
-# Symbol: SND_SOC_SOF_INTEL_SOUNDWIRE_LINK [=n]
-# Type : bool
-# Defined at sound/soc/sof/intel/Kconfig:356
-# Prompt: SOF support for SoundWire
-# Depends on: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_SOF_TOPLEVEL [=y] && SND_SOC_SOF_INTEL_TOPLEVEL [=y] && SND_SOC_SOF_INTEL_PCI [=m] && ACPI [=y]
-# Location:
-# -> Device Drivers
-# -> Sound card support (SOUND [=m])
-# -> Advanced Linux Sound Architecture (SND [=m])
-# -> ALSA for SoC audio support (SND_SOC [=m])
-# -> Sound Open Firmware Support (SND_SOC_SOF_TOPLEVEL [=y])
-# -> SOF support for Intel audio DSPs (SND_SOC_SOF_INTEL_TOPLEVEL [=y])
-#
-#
-#
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/875
3 weeks, 1 day
[OS-BUILD PATCH] [redhat] New configs in drivers/gpu
by GitLab Bridge on behalf of jeremycline
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
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_DRM_AMD_DC_DCN3_0:
Choose this option if you want to have
sienna_cichlid support for display engine
Symbol: DRM_AMD_DC_DCN3_0 [=n]
Type : bool
Defined at drivers/gpu/drm/amd/display/Kconfig:20
Prompt: DCN 3.0 family
Depends on: HAS_IOMEM [=y] && DRM [=m] && DRM_AMDGPU [=m] && DRM_AMD_DC [=y] && X86 [=y] && DRM_AMD_DC_DCN [=y]
Location:
-> Device Drivers
-> Graphics support
-> AMD GPU (DRM_AMDGPU [=m])
-> Display Engine Configuration
---
CONFIG_NOUVEAU_DEBUG_PUSH:
Say Y here if you want to enable verbose push buffer debug output
and sanity checks.
Symbol: NOUVEAU_DEBUG_PUSH [=n]
Type : bool
Defined at drivers/gpu/drm/nouveau/Kconfig:79
Prompt: Enable additional push buffer debugging
Depends on: HAS_IOMEM [=y] && DRM_NOUVEAU [=m]
Location:
-> Device Drivers
-> Graphics support
-> Nouveau (NVIDIA) cards (DRM_NOUVEAU [=m])
---
Cc: David Airlie <airlied(a)redhat.com>
Cc: Adam Jackson <ajax(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_DRM_AMD_DC_DCN3_0 | 1 +
.../common/generic/CONFIG_NOUVEAU_DEBUG_PUSH | 1 +
.../generic/CONFIG_DRM_AMD_DC_DCN3_0 | 19 -------------------
.../generic/CONFIG_NOUVEAU_DEBUG_PUSH | 18 ------------------
4 files changed, 2 insertions(+), 37 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0
create mode 100644 redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
diff --git a/redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0 b/redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0
new file mode 100644
index 000000000000..708bd22e809e
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_DRM_AMD_DC_DCN3_0
@@ -0,0 +1 @@
+# CONFIG_DRM_AMD_DC_DCN3_0 is not set
diff --git a/redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH b/redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
new file mode 100644
index 000000000000..5614c2c49809
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
@@ -0,0 +1 @@
+# CONFIG_NOUVEAU_DEBUG_PUSH is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0 b/redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0
deleted file mode 100644
index f6a3c764772e..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_DRM_AMD_DC_DCN3_0
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_DRM_AMD_DC_DCN3_0:
-#
-# Choose this option if you want to have
-# sienna_cichlid support for display engine
-#
-# Symbol: DRM_AMD_DC_DCN3_0 [=n]
-# Type : bool
-# Defined at drivers/gpu/drm/amd/display/Kconfig:20
-# Prompt: DCN 3.0 family
-# Depends on: HAS_IOMEM [=y] && DRM [=m] && DRM_AMDGPU [=m] && DRM_AMD_DC [=y] && X86 [=y] && DRM_AMD_DC_DCN [=y]
-# Location:
-# -> Device Drivers
-# -> Graphics support
-# -> AMD GPU (DRM_AMDGPU [=m])
-# -> Display Engine Configuration
-#
-#
-#
-# CONFIG_DRM_AMD_DC_DCN3_0 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH b/redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
deleted file mode 100644
index c28eaf703375..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_NOUVEAU_DEBUG_PUSH
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_NOUVEAU_DEBUG_PUSH:
-#
-# Say Y here if you want to enable verbose push buffer debug output
-# and sanity checks.
-#
-# Symbol: NOUVEAU_DEBUG_PUSH [=n]
-# Type : bool
-# Defined at drivers/gpu/drm/nouveau/Kconfig:79
-# Prompt: Enable additional push buffer debugging
-# Depends on: HAS_IOMEM [=y] && DRM_NOUVEAU [=m]
-# Location:
-# -> Device Drivers
-# -> Graphics support
-# -> Nouveau (NVIDIA) cards (DRM_NOUVEAU [=m])
-#
-#
-#
-# CONFIG_NOUVEAU_DEBUG_PUSH is not set
--
GitLab
3 weeks, 5 days
[OS-BUILD PATCH] [redhat] New configs in drivers/vdpa
by GitLab Bridge on behalf of redhat-patchlab
From: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
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.
---
Cc: "Michael S. Tsirkin" <mst(a)redhat.com>
Cc: Jason Wang <jasowang(a)redhat.com>
Cc: rhvirt-patches(a)redhat.com
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_VDPA_SIM_NET | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_VDPA_SIM_NET
diff --git a/redhat/configs/common/generic/CONFIG_VDPA_SIM_NET b/redhat/configs/common/generic/CONFIG_VDPA_SIM_NET
new file mode 100644
index 000000000000..e69de29bb2d1
--
GitLab
3 weeks, 5 days
