[ARK PATCH] Work around for gcc bug
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
by GitLab Bridge on behalf of jmflinuxtx
From: "Justin M. Forbes" <jforbes(a)fedoraproject.org>
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
crypto/aegis128-neon-inner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/aegis128-neon-inner.c b/crypto/aegis128-neon-inner.c
index 2a660ac1bc3a..fa87ff6a2a71 100644
--- a/crypto/aegis128-neon-inner.c
+++ b/crypto/aegis128-neon-inner.c
@@ -148,8 +148,8 @@ void crypto_aegis128_init_neon(void *state, const void *key, const void *iv)
kiv,
vld1q_u8(const1),
vld1q_u8(const0),
- k ^ vld1q_u8(const0),
- k ^ vld1q_u8(const1),
+ (uint8x16_t) (k ^ vld1q_u8(const0)),
+ (uint8x16_t) (k ^ vld1q_u8(const1)),
}};
int i;
--
GitLab
3 years, 6 months
[OS-BUILD PATCH] redhat/configs: Cleanup CONFIG_CRYPTO_SHA512
by GitLab Bridge on behalf of prarit
From: Prarit Bhargava <prarit(a)redhat.com>
dzickus pointed out that my change is not optimal. CONFIG_CRYPTO_SHA512
can be moved to the common/generic directory since it is enabled on
both Fedora and ARK.
Cleanup the CONFIG_CRYPTO_SHA512 files.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
Cc: dzickus(a)redhat.com
Cc: jforbes(a)redhat.com
---
redhat/configs/{ark => common}/generic/CONFIG_CRYPTO_SHA512 | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename redhat/configs/{ark => common}/generic/CONFIG_CRYPTO_SHA512 (100%)
diff --git a/redhat/configs/ark/generic/CONFIG_CRYPTO_SHA512 b/redhat/configs/common/generic/CONFIG_CRYPTO_SHA512
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_CRYPTO_SHA512
rename to redhat/configs/common/generic/CONFIG_CRYPTO_SHA512
--
GitLab
3 years, 6 months
[OS-BUILD PATCH] [redhat] New configs in drivers/firmware
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_EFI_CUSTOM_SSDT_OVERLAYS:
Allow loading of an ACPI SSDT overlay from an EFI variable specified
by a kernel command line option.
See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
information.
Symbol: EFI_CUSTOM_SSDT_OVERLAYS [=y]
Type : bool
Defined at drivers/firmware/efi/Kconfig:282
Prompt: Load custom ACPI SSDT overlay from an EFI variable
Depends on: EFI_VARS [=y] && ACPI [=y]
Location:
-> Firmware Drivers
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS | 1 +
.../generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS | 19 -------------------
2 files changed, 1 insertion(+), 19 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
diff --git a/redhat/configs/common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS b/redhat/configs/common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
new file mode 100644
index 000000000000..e2c7e30e6b05
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
@@ -0,0 +1 @@
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS b/redhat/configs/pending-common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
deleted file mode 100644
index fc032cb4eb88..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS:
-#
-# Allow loading of an ACPI SSDT overlay from an EFI variable specified
-# by a kernel command line option.
-#
-# See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
-# information.
-#
-# Symbol: EFI_CUSTOM_SSDT_OVERLAYS [=y]
-# Type : bool
-# Defined at drivers/firmware/efi/Kconfig:282
-# Prompt: Load custom ACPI SSDT overlay from an EFI variable
-# Depends on: EFI_VARS [=y] && ACPI [=y]
-# Location:
-# -> Firmware Drivers
-#
-#
-#
-CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
--
GitLab
3 years, 6 months
[OS-BUILD PATCH] genspec.sh: rebase the broken-out patches
by GitLab Bridge on behalf of omos
From: Ondrej Mosnacek <omosnace(a)redhat.com>
When generating the patches under $SINGLE_TARBALL == 0, cherry-pick each
commit on top of $MARKER before generating the patch from it. This
partly solves the problem of patches generated from old commits not
applying on the current tree any more.
To avoid polluting the current working copy, this is done in a temporary
worktree inside a temporary directory, which is automatically deleted
when the script exits.
Signed-off-by: Ondrej Mosnacek <omosnace(a)redhat.com>
---
redhat/genspec.sh | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index b72dffe14729..0996ddf44812 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -23,7 +23,6 @@ TARFILE_RELEASE=${16}
SNAPSHOT=${17}
BUILDID=${18}
RPMVERSION=${KVERSION}.${KPATCHLEVEL}.${KSUBLEVEL}
-clogf="$SOURCES/changelog"
# hide [redhat] entries from changelog
HIDE_REDHAT=1;
# hide entries for unsupported arches
@@ -36,6 +35,20 @@ LC_TIME=
STAMP=$(echo $MARKER | cut -f 1 -d '-' | sed -e "s/v//");
RPM_VERSION="$RPMVERSION-$PKGRELEASE";
+function cleanup() {
+ set +ex
+ [ -n "$tmpwt" ] && git worktree remove -f "$tmpwt"
+ [ -n "$tmpdir" ] && rm -rf "$tmpdir"
+ return 0
+}
+
+trap cleanup EXIT
+
+tmpdir="$(mktemp -d)"
+clogf="$tmpdir/changelog"
+
+trap 'rm -rf $tmpdir' EXIT
+
echo >$clogf
lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${RPMVERSION}" --max-count=1 HEAD)
@@ -255,7 +268,12 @@ if [ "$SINGLE_TARBALL" = 0 ]; then
":(exclude,top)makefile" \
":(exclude,top)Makefile.rhelver" \
":(exclude,top)redhat")
- for c in $COMMITS; do
+ git worktree add --detach "$tmpdir/work" "$MARKER"
+ tmpwt="$tmpdir/work"
+ for origc in $COMMITS; do
+ git -C "$tmpwt" cherry-pick --allow-empty --keep-redundant-commits \
+ "$origc" || exit 1
+ commit="$(git -C "$tmpwt" rev-parse --verify HEAD)"
patch=$(git format-patch --zero-commit -1 "$c")
echo "$patch" >> $plistf
mv $patch $SOURCES/
@@ -274,5 +292,3 @@ for opt in $BUILDOPTS; do
[ -z "${opt##-*}" ] && add_opt="_without_${opt#?}"
[ -n "$add_opt" ] && sed -i "s/^\\(# The following build options\\)/%define $add_opt 1\\n\\1/" $SPECFILE
done
-
-rm -f $clogf{,.rev,.stripped};
--
GitLab
3 years, 6 months
[OS-BUILD PATCH] [redhat] New configs in drivers/mfd
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_MFD_MP2629:
Select this option to enable support for Monolithic Power Systems
battery charger. This provides ADC, thermal and battery charger power
management functions.
Symbol: MFD_MP2629 [=n]
Type : tristate
Defined at drivers/mfd/Kconfig:452
Prompt: Monolithic Power Systems MP2629 ADC and Battery charger
Depends on: HAS_IOMEM [=y] && I2C [=y]
Location:
-> Device Drivers
-> Multifunction device drivers
Selects: REGMAP_I2C [=m]
---
CONFIG_MFD_MT6360:
Say Y here to enable MT6360 PMU/PMIC/LDO functional support.
PMU part includes Charger, Flashlight, RGB LED
PMIC part includes 2-channel BUCKs and 2-channel LDOs
LDO part includes 4-channel LDOs
Symbol: MFD_MT6360 [=n]
Type : tristate
Defined at drivers/mfd/Kconfig:911
Prompt: Mediatek MT6360 SubPMIC
Depends on: HAS_IOMEM [=y] && I2C [=y]
Location:
-> Device Drivers
-> Multifunction device drivers
Selects: MFD_CORE [=y] && REGMAP_I2C [=m] && REGMAP_IRQ [=y]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../configs/common/generic/CONFIG_MFD_MP2629 | 1 +
.../configs/common/generic/CONFIG_MFD_MT6360 | 1 +
.../pending-common/generic/CONFIG_MFD_MP2629 | 19 ------------------
.../pending-common/generic/CONFIG_MFD_MT6360 | 20 -------------------
4 files changed, 2 insertions(+), 39 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MFD_MP2629
create mode 100644 redhat/configs/common/generic/CONFIG_MFD_MT6360
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MFD_MP2629
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MFD_MT6360
diff --git a/redhat/configs/common/generic/CONFIG_MFD_MP2629 b/redhat/configs/common/generic/CONFIG_MFD_MP2629
new file mode 100644
index 000000000000..2bbfa6798c28
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MFD_MP2629
@@ -0,0 +1 @@
+# CONFIG_MFD_MP2629 is not set
diff --git a/redhat/configs/common/generic/CONFIG_MFD_MT6360 b/redhat/configs/common/generic/CONFIG_MFD_MT6360
new file mode 100644
index 000000000000..34ddea555002
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MFD_MT6360
@@ -0,0 +1 @@
+# CONFIG_MFD_MT6360 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_MFD_MP2629 b/redhat/configs/pending-common/generic/CONFIG_MFD_MP2629
deleted file mode 100644
index ab50ee3da837..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MFD_MP2629
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_MFD_MP2629:
-#
-# Select this option to enable support for Monolithic Power Systems
-# battery charger. This provides ADC, thermal and battery charger power
-# management functions.
-#
-# Symbol: MFD_MP2629 [=n]
-# Type : tristate
-# Defined at drivers/mfd/Kconfig:452
-# Prompt: Monolithic Power Systems MP2629 ADC and Battery charger
-# Depends on: HAS_IOMEM [=y] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> Multifunction device drivers
-# Selects: REGMAP_I2C [=m]
-#
-#
-#
-# CONFIG_MFD_MP2629 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_MFD_MT6360 b/redhat/configs/pending-common/generic/CONFIG_MFD_MT6360
deleted file mode 100644
index c12a9433572a..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MFD_MT6360
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG_MFD_MT6360:
-#
-# Say Y here to enable MT6360 PMU/PMIC/LDO functional support.
-# PMU part includes Charger, Flashlight, RGB LED
-# PMIC part includes 2-channel BUCKs and 2-channel LDOs
-# LDO part includes 4-channel LDOs
-#
-# Symbol: MFD_MT6360 [=n]
-# Type : tristate
-# Defined at drivers/mfd/Kconfig:911
-# Prompt: Mediatek MT6360 SubPMIC
-# Depends on: HAS_IOMEM [=y] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> Multifunction device drivers
-# Selects: MFD_CORE [=y] && REGMAP_I2C [=m] && REGMAP_IRQ [=y]
-#
-#
-#
-# CONFIG_MFD_MT6360 is not set
--
2.26.2
3 years, 6 months
[OS-BUILD PATCH] [redhat] New configs in drivers/mfd
by GitLab Bridge on behalf of jeremycline
From: "CKI@GitLab" <cki-project(a)redhat.com>
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_MFD_INTEL_PMC_BXT:
This driver provides support for the PMC (Power Management
Controller) on Intel Broxton and Apollo Lake. The PMC is a
multi-function device that exposes IPC, General Control
Register and P-unit access. In addition this creates devices
for iTCO watchdog and telemetry that are part of the PMC.
Symbol: MFD_INTEL_PMC_BXT [=n]
Type : tristate
Defined at drivers/mfd/Kconfig:650
Prompt: Intel PMC Driver for Broxton
Depends on: HAS_IOMEM [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] && ACPI [=y]
Location:
-> Device Drivers
-> Multifunction device drivers
Selects: INTEL_SCU_IPC [=n] && MFD_CORE [=y]
---
Signed-off-by: CKI@GitLab <cki-project(a)redhat.com>
---
.../common/generic/CONFIG_MFD_INTEL_PMC_BXT | 1 +
.../generic/CONFIG_MFD_INTEL_PMC_BXT | 21 -------------------
2 files changed, 1 insertion(+), 21 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MFD_INTEL_PMC_BXT
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MFD_INTEL_PMC_BXT
diff --git a/redhat/configs/common/generic/CONFIG_MFD_INTEL_PMC_BXT b/redhat/configs/common/generic/CONFIG_MFD_INTEL_PMC_BXT
new file mode 100644
index 000000000000..d6d6d1a92d8e
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MFD_INTEL_PMC_BXT
@@ -0,0 +1 @@
+# CONFIG_MFD_INTEL_PMC_BXT is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_MFD_INTEL_PMC_BXT b/redhat/configs/pending-common/generic/CONFIG_MFD_INTEL_PMC_BXT
deleted file mode 100644
index daf2341bbade..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MFD_INTEL_PMC_BXT
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_MFD_INTEL_PMC_BXT:
-#
-# This driver provides support for the PMC (Power Management
-# Controller) on Intel Broxton and Apollo Lake. The PMC is a
-# multi-function device that exposes IPC, General Control
-# Register and P-unit access. In addition this creates devices
-# for iTCO watchdog and telemetry that are part of the PMC.
-#
-# Symbol: MFD_INTEL_PMC_BXT [=n]
-# Type : tristate
-# Defined at drivers/mfd/Kconfig:650
-# Prompt: Intel PMC Driver for Broxton
-# Depends on: HAS_IOMEM [=y] && X86 [=y] && X86_PLATFORM_DEVICES [=y] && ACPI [=y]
-# Location:
-# -> Device Drivers
-# -> Multifunction device drivers
-# Selects: INTEL_SCU_IPC [=n] && MFD_CORE [=y]
-#
-#
-#
-# CONFIG_MFD_INTEL_PMC_BXT is not set
--
2.26.2
3 years, 6 months
[OS-BUILD PATCH] [redhat] New configs in drivers/mfd
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.
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_MFD_KHADAS_MCU | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MFD_KHADAS_MCU
diff --git a/redhat/configs/common/generic/CONFIG_MFD_KHADAS_MCU b/redhat/configs/common/generic/CONFIG_MFD_KHADAS_MCU
new file mode 100644
index 000000000000..e69de29bb2d1
--
GitLab
3 years, 6 months
[OS-BUILD PATCH] [redhat] New configs in drivers/usb
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_USB_OTG_PRODUCTLIST:
If you say Y here, the "otg_productlist.h" file will be used as a
product list, so USB peripherals not listed there will be
rejected during enumeration. This behavior is required by the
USB OTG and EH specification for all devices not on your product's
"Targeted Peripherals List". "Embedded Hosts" are likewise
allowed to support only a limited number of peripherals.
Symbol: USB_OTG_PRODUCTLIST [=n]
Type : bool
Defined at drivers/usb/core/Kconfig:58
Prompt: Rely on OTG and EH Targeted Peripherals List
Depends on: USB_SUPPORT [=y] && USB [=y]
Location:
-> Device Drivers
-> USB support (USB_SUPPORT [=y])
---
Cc: Torez Smith <torez(a)redhat.com>
Cc: Don Zickus <dzickus(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_USB_OTG_PRODUCTLIST | 1 +
.../generic/CONFIG_USB_OTG_PRODUCTLIST | 21 -------------------
2 files changed, 1 insertion(+), 21 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_USB_OTG_PRODUCTLIST
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_USB_OTG_PRODUCTLIST
diff --git a/redhat/configs/common/generic/CONFIG_USB_OTG_PRODUCTLIST b/redhat/configs/common/generic/CONFIG_USB_OTG_PRODUCTLIST
new file mode 100644
index 000000000000..a9ccf6a0ef8f
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_USB_OTG_PRODUCTLIST
@@ -0,0 +1 @@
+# CONFIG_USB_OTG_PRODUCTLIST is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_USB_OTG_PRODUCTLIST b/redhat/configs/pending-common/generic/CONFIG_USB_OTG_PRODUCTLIST
deleted file mode 100644
index 639540198635..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_USB_OTG_PRODUCTLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_USB_OTG_PRODUCTLIST:
-#
-# If you say Y here, the "otg_productlist.h" file will be used as a
-# product list, so USB peripherals not listed there will be
-# rejected during enumeration. This behavior is required by the
-# USB OTG and EH specification for all devices not on your product's
-# "Targeted Peripherals List". "Embedded Hosts" are likewise
-# allowed to support only a limited number of peripherals.
-#
-# Symbol: USB_OTG_PRODUCTLIST [=n]
-# Type : bool
-# Defined at drivers/usb/core/Kconfig:58
-# Prompt: Rely on OTG and EH Targeted Peripherals List
-# Depends on: USB_SUPPORT [=y] && USB [=y]
-# Location:
-# -> Device Drivers
-# -> USB support (USB_SUPPORT [=y])
-#
-#
-#
-# CONFIG_USB_OTG_PRODUCTLIST is not set
--
GitLab
3 years, 6 months
[OS-BUILD PATCH] [redhat] New configs in drivers/usb
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_USB_XHCI_PCI_RENESAS:
Say 'Y' to enable the support for the Renesas xHCI controller with
firwmare. Make sure you have the firwmare for the device and
installed on your system for this device to work.
If unsure, say 'N'.
Symbol: USB_XHCI_PCI_RENESAS [=n]
Type : tristate
Defined at drivers/usb/host/Kconfig:46
Prompt: Support for additional Renesas xHCI controller with firwmare
Depends on: USB_SUPPORT [=y] && USB [=y] && USB_XHCI_HCD [=y]
Location:
-> Device Drivers
-> USB support (USB_SUPPORT [=y])
-> xHCI HCD (USB 3.0) support (USB_XHCI_HCD [=y])
---
Cc: Torez Smith <torez(a)redhat.com>
Cc: Don Zickus <dzickus(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_USB_XHCI_PCI_RENESAS | 1 +
.../generic/CONFIG_USB_XHCI_PCI_RENESAS | 20 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_USB_XHCI_PCI_RENESAS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_USB_XHCI_PCI_RENESAS
diff --git a/redhat/configs/common/generic/CONFIG_USB_XHCI_PCI_RENESAS b/redhat/configs/common/generic/CONFIG_USB_XHCI_PCI_RENESAS
new file mode 100644
index 000000000000..0d81c3d4d186
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_USB_XHCI_PCI_RENESAS
@@ -0,0 +1 @@
+# CONFIG_USB_XHCI_PCI_RENESAS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_USB_XHCI_PCI_RENESAS b/redhat/configs/pending-common/generic/CONFIG_USB_XHCI_PCI_RENESAS
deleted file mode 100644
index f9fe971851e3..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_USB_XHCI_PCI_RENESAS
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG_USB_XHCI_PCI_RENESAS:
-#
-# Say 'Y' to enable the support for the Renesas xHCI controller with
-# firwmare. Make sure you have the firwmare for the device and
-# installed on your system for this device to work.
-# If unsure, say 'N'.
-#
-# Symbol: USB_XHCI_PCI_RENESAS [=n]
-# Type : tristate
-# Defined at drivers/usb/host/Kconfig:46
-# Prompt: Support for additional Renesas xHCI controller with firwmare
-# Depends on: USB_SUPPORT [=y] && USB [=y] && USB_XHCI_HCD [=y]
-# Location:
-# -> Device Drivers
-# -> USB support (USB_SUPPORT [=y])
-# -> xHCI HCD (USB 3.0) support (USB_XHCI_HCD [=y])
-#
-#
-#
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
--
2.26.2
3 years, 6 months