❌ FAIL: Test report for kernel (ark)
by CKI Project
Hello,
We ran automated tests on a recent commit from this kernel tree:
Kernel repo: https://gitlab.com/cki-project/kernel-ark.git
Commit: 1bc3bd9d5411 - [redhat] kernel-5.8.0-0.rc1.20200617git69119673bd50.1
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Merge: OK
Compile: FAILED
All kernel binaries, config files, and logs are available for download here:
https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawa...
We attempted to compile the kernel for multiple architectures, but the compile
failed on one or more architectures:
aarch64: FAILED (see build-aarch64.log.xz attachment)
ppc64le: FAILED (see build-ppc64le.log.xz attachment)
s390x: FAILED (see build-s390x.log.xz attachment)
x86_64: FAILED (see build-x86_64.log.xz attachment)
We hope that these logs can help you find the problem quickly. For the full
detail on our testing procedures, please scroll to the bottom of this message.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
rpmbuild arguments: rpmbuild --target aarch64 --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
ppc64le:
rpmbuild arguments: rpmbuild --target ppc64le --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
s390x:
rpmbuild arguments: rpmbuild --target s390x --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
x86_64:
rpmbuild arguments: rpmbuild --target x86_64 --with=kabidw_base --without=debug
3 years, 10 months
[PATCH] Add dual fan control for several Lenovo notebooks
by Stefan Assmann
Could we add this patch to Fedora 32 please? It's going to make a lot of
Thinkpad users with dual fans happy. The patch has just hit 5.8-rc1.
Thanks!
Stefan
---
...nkpad_acpi-Add-support-for-dual-fan-.patch | 136 ++++++++++++++++++
kernel.spec | 7 +
2 files changed, 143 insertions(+)
create mode 100644 0001-platform-x86-thinkpad_acpi-Add-support-for-dual-fan-.patch
diff --git a/0001-platform-x86-thinkpad_acpi-Add-support-for-dual-fan-.patch b/0001-platform-x86-thinkpad_acpi-Add-support-for-dual-fan-.patch
new file mode 100644
index 000000000000..d747d83013f4
--- /dev/null
+++ b/0001-platform-x86-thinkpad_acpi-Add-support-for-dual-fan-.patch
@@ -0,0 +1,136 @@
+From 14232c6e788cb1f7b96dbd08b077f90923324b24 Mon Sep 17 00:00:00 2001
+From: Lars Hofhansl <larsh(a)apache.org>
+Date: Thu, 23 Apr 2020 14:57:09 -0700
+Subject: [PATCH] platform/x86: thinkpad_acpi: Add support for dual fan control
+
+This adds dual fan control for the following models:
+P50, P51, P52, P70, P71, P72, P1 gen1, P2 gen2, X1E gen1 and X1E gen2.
+
+Both fans are controlled together as if they were a single fan.
+
+Tested on an X1 Extreme Gen1, an X1 Extreme Gen2, and a P50.
+
+The patch is defensive, it adds only specific supported machines, and falls
+back to the old behavior if both fans cannot be controlled.
+
+Background:
+I tested the BIOS default behavior on my X1E gen2 and both fans are always
+changed together. So rather than adding controls for each fan, this controls
+both fans together as the BIOS would do.
+
+This was inspired by a discussion on dual fan support for the thinkfan tool
+(see link below). All BIOS IDs are taken from there. The X1E gen2 ID is
+verified on my machine.
+
+Thanks to GitHub users voidworker and civic9 for the earlier patches and
+BIOS IDs, and to users peter-stoll and sassman for testing the patch on
+their machines.
+
+BugLink: https://github.com/vmatare/thinkfan/issues/58
+Signed-off-by: Lars Hofhansl <larsh(a)apache.org>
+[andy: massaged commit message to capitalize ID and convert to BugLink]
+Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
+---
+ drivers/platform/x86/thinkpad_acpi.c | 43 ++++++++++++++++++++++++----
+ 1 file changed, 37 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
+index 8eaadbaf8ffa..83b4a83da967 100644
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -318,6 +318,7 @@ static struct {
+ u32 uwb:1;
+ u32 fan_ctrl_status_undef:1;
+ u32 second_fan:1;
++ u32 second_fan_ctl:1;
+ u32 beep_needs_two_args:1;
+ u32 mixer_no_level_control:1;
+ u32 battery_force_primary:1;
+@@ -8324,11 +8325,19 @@ static int fan_set_level(int level)
+
+ switch (fan_control_access_mode) {
+ case TPACPI_FAN_WR_ACPI_SFAN:
+- if (level >= 0 && level <= 7) {
+- if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", level))
+- return -EIO;
+- } else
++ if ((level < 0) || (level > 7))
+ return -EINVAL;
++
++ if (tp_features.second_fan_ctl) {
++ if (!fan_select_fan2() ||
++ !acpi_evalf(sfan_handle, NULL, NULL, "vd", level)) {
++ pr_warn("Couldn't set 2nd fan level, disabling support\n");
++ tp_features.second_fan_ctl = 0;
++ }
++ fan_select_fan1();
++ }
++ if (!acpi_evalf(sfan_handle, NULL, NULL, "vd", level))
++ return -EIO;
+ break;
+
+ case TPACPI_FAN_WR_ACPI_FANS:
+@@ -8345,6 +8354,15 @@ static int fan_set_level(int level)
+ else if (level & TP_EC_FAN_AUTO)
+ level |= 4; /* safety min speed 4 */
+
++ if (tp_features.second_fan_ctl) {
++ if (!fan_select_fan2() ||
++ !acpi_ec_write(fan_status_offset, level)) {
++ pr_warn("Couldn't set 2nd fan level, disabling support\n");
++ tp_features.second_fan_ctl = 0;
++ }
++ fan_select_fan1();
++
++ }
+ if (!acpi_ec_write(fan_status_offset, level))
+ return -EIO;
+ else
+@@ -8763,6 +8781,7 @@ static const struct attribute_group fan_attr_group = {
+
+ #define TPACPI_FAN_Q1 0x0001 /* Unitialized HFSP */
+ #define TPACPI_FAN_2FAN 0x0002 /* EC 0x31 bit 0 selects fan2 */
++#define TPACPI_FAN_2CTL 0x0004 /* selects fan2 control */
+
+ static const struct tpacpi_quirk fan_quirk_table[] __initconst = {
+ TPACPI_QEC_IBM('1', 'Y', TPACPI_FAN_Q1),
+@@ -8771,6 +8790,13 @@ static const struct tpacpi_quirk fan_quirk_table[] __initconst = {
+ TPACPI_QEC_IBM('7', '0', TPACPI_FAN_Q1),
+ TPACPI_QEC_LNV('7', 'M', TPACPI_FAN_2FAN),
+ TPACPI_Q_LNV('N', '1', TPACPI_FAN_2FAN),
++ TPACPI_Q_LNV3('N', '1', 'D', TPACPI_FAN_2CTL), /* P70 */
++ TPACPI_Q_LNV3('N', '1', 'E', TPACPI_FAN_2CTL), /* P50 */
++ TPACPI_Q_LNV3('N', '1', 'T', TPACPI_FAN_2CTL), /* P71 */
++ TPACPI_Q_LNV3('N', '1', 'U', TPACPI_FAN_2CTL), /* P51 */
++ TPACPI_Q_LNV3('N', '2', 'C', TPACPI_FAN_2CTL), /* P52 / P72 */
++ TPACPI_Q_LNV3('N', '2', 'E', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (1st gen) */
++ TPACPI_Q_LNV3('N', '2', 'O', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (2nd gen) */
+ };
+
+ static int __init fan_init(struct ibm_init_struct *iibm)
+@@ -8788,6 +8814,7 @@ static int __init fan_init(struct ibm_init_struct *iibm)
+ fan_watchdog_maxinterval = 0;
+ tp_features.fan_ctrl_status_undef = 0;
+ tp_features.second_fan = 0;
++ tp_features.second_fan_ctl = 0;
+ fan_control_desired_level = 7;
+
+ if (tpacpi_is_ibm()) {
+@@ -8812,8 +8839,12 @@ static int __init fan_init(struct ibm_init_struct *iibm)
+ fan_quirk1_setup();
+ if (quirks & TPACPI_FAN_2FAN) {
+ tp_features.second_fan = 1;
+- dbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_FAN,
+- "secondary fan support enabled\n");
++ pr_info("secondary fan support enabled\n");
++ }
++ if (quirks & TPACPI_FAN_2CTL) {
++ tp_features.second_fan = 1;
++ tp_features.second_fan_ctl = 1;
++ pr_info("secondary fan control enabled\n");
+ }
+ } else {
+ pr_err("ThinkPad ACPI EC access misbehaving, fan status and control unavailable\n");
+--
+2.26.2
+
diff --git a/kernel.spec b/kernel.spec
index d0ee89493eb6..3aedb338b07e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -921,6 +921,9 @@ Patch519: vboxguest-fixes.patch
# rhbz 1830150
Patch520: 0001-platform-x86-sony-laptop-SNC-calls-should-handle-BUF.patch
+# Thinkpad dual fan control
+Patch521: 0001-platform-x86-thinkpad_acpi-Add-support-for-dual-fan-.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -3017,6 +3020,10 @@ fi
#
#
%changelog
+* Mon Jun 15 2020 Stefan Assmann <sassmann(a)redhat.com>
+- Add dual fan control for P50, P51, P52, P70, P71, P72, P1 gen1, P2 gen2,
+ X1E gen1 and X1E gen2.
+
* Wed Jun 10 2020 Justin M. Forbes <jforbes(a)fedoraproject.org> - 5.6.18-300
- Linux v5.6.18
--
2.26.2
3 years, 10 months
Kernel 5.7.X <=33
by Jóhann B. Guðmundsson
Hi
I'm not seeing any kernel 5.7.1, 5.7.2 kernel builds in koji and on it's
way to <=33 now after 5.7.1 had been released ( expected after 5.7.1,
there are two weeks since last 5.7.x build ) is that part of this new
workflow along with this significant CI noise and needless one line ack
messages on what was otherwise a mailinglist in which people could have
meaningful discussions ( as of today 41 messages of pure noise until you
reach Justin Forbes "Re: Streamlining the ARK config process" )?
Did not the RH management that conducted this takeover of the Fedora
kernel process even consider creating a separated mailinglist (
kernel-ci, kernel-build whatever ) when it started projecting it's
internal spaghetti mess of process,workflows and cluttered pipelines
onto the community?
JBG
3 years, 10 months
Re: Kernel 5.7.X <=33
by Jóhann B. Guðmundsson
On 16.6.2020 12:13, Reindl Harald (privat) wrote:
>
> Am 16.06.20 um 12:21 schrieb Jóhann B. Guðmundsson:
>> I'm not seeing any kernel 5.7.1, 5.7.2 kernel builds in koji and on it's
>> way to <=33 now after 5.7.1 had been released ( expected after 5.7.1,
>> there are two weeks since last 5.7.x build ) is that part of this new
>> workflow along with this significant CI....
> stop spreading bullshit
If you call kernels own documentation bullshit [1]
At best I'm misunderstanding them or the process has changed overtime.
> the rebase for years is 5.4.3, 5.5.3, 5.6.3 and so it's expected to be
> 5.7.3 while you make a fuss about 5.7.1 where *never ever* in the past
> 14 years a .1 release was built for stable Fedora
>
> are you mentally ill or where does your Redhat hate come from?
You resort to personal attacks and accusations in individual private
communications when people send emails to Fedora mailinglists.
How many mails like this do you send privately to persons inside and
outside of the Fedora community everyday?
> --------------------
>
> kernel v5.1 was released yesterday and is now available in the Rawhide
> repository. We'll be following the usual rebase procedure: after a few
> stable updates (5.1.2 or 5.1.3) Fedora 30 will be rebased, with Fedora
> 29 following shortly after that. This will likely occur in early June.
> Fedora 28 reaches end of life May 28th so it will not be rebased.
>
> --------------------
>
> As you probably have seen, kernel 5.0 was released last night. This
> has been built in rawhide. We'll be following the usual rebase
> procedure for f29 and f28: Around the time when 5.0.2 or 5.0.3
> is released, that kernel will go into f29. f28 will be rebased
> shortly afterwards. We don't have any control over when upstream
> will release a stable kernel but best guess would be that f29
> will get 5.0 by early to mid April.
>
> --------------------
JBG
1. https://fedoraproject.org/wiki/Kernel#Schedule
3 years, 10 months
[OS-BUILD PATCH] [redhat] New configs in drivers/i2c
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_I2C_QCOM_CCI:
If you say yes to this option, support will be included for the
built-in camera control interface on the Qualcomm SoCs.
This driver can also be built as a module. If so, the module
will be called i2c-qcom-cci.
Symbol: I2C_QCOM_CCI [=n]
Type : tristate
Defined at drivers/i2c/busses/Kconfig:900
Prompt: Qualcomm Camera Control Interface
Depends on: I2C [=y] && HAS_IOMEM [=y] && (ARCH_QCOM [=y] || COMPILE_TEST [=n])
Location:
-> Device Drivers
-> I2C support
-> I2C support (I2C [=y])
-> I2C Hardware Bus support
---
Cc: Gopal Tiwari <gtiwari(a)redhat.com>
Cc: David Arcari <darcari(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_I2C_QCOM_CCI | 1 +
.../generic/CONFIG_I2C_QCOM_CCI | 22 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_I2C_QCOM_CCI
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_I2C_QCOM_CCI
diff --git a/redhat/configs/common/generic/CONFIG_I2C_QCOM_CCI b/redhat/configs/common/generic/CONFIG_I2C_QCOM_CCI
new file mode 100644
index 000000000000..b66c46744f33
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_I2C_QCOM_CCI
@@ -0,0 +1 @@
+# CONFIG_I2C_QCOM_CCI is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_I2C_QCOM_CCI b/redhat/configs/pending-common/generic/CONFIG_I2C_QCOM_CCI
deleted file mode 100644
index d7c3c454c87f..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_I2C_QCOM_CCI
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_I2C_QCOM_CCI:
-#
-# If you say yes to this option, support will be included for the
-# built-in camera control interface on the Qualcomm SoCs.
-#
-# This driver can also be built as a module. If so, the module
-# will be called i2c-qcom-cci.
-#
-# Symbol: I2C_QCOM_CCI [=n]
-# Type : tristate
-# Defined at drivers/i2c/busses/Kconfig:900
-# Prompt: Qualcomm Camera Control Interface
-# Depends on: I2C [=y] && HAS_IOMEM [=y] && (ARCH_QCOM [=y] || COMPILE_TEST [=n])
-# Location:
-# -> Device Drivers
-# -> I2C support
-# -> I2C support (I2C [=y])
-# -> I2C Hardware Bus support
-#
-#
-#
-# CONFIG_I2C_QCOM_CCI is not set
--
GitLab
3 years, 10 months
❌ FAIL: Test report for kernel (ark)
by CKI Project
Hello,
We ran automated tests on a recent commit from this kernel tree:
Kernel repo: https://gitlab.com/cki-project/kernel-ark.git
Commit: 1d42396aa921 - [redhat] kernel-5.8.0-0.rc0.20200613gitdf2fbf5bfa0e.1
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Merge: OK
Compile: FAILED
All kernel binaries, config files, and logs are available for download here:
https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawa...
We attempted to compile the kernel for multiple architectures, but the compile
failed on one or more architectures:
aarch64: FAILED (see build-aarch64.log.xz attachment)
ppc64le: FAILED (see build-ppc64le.log.xz attachment)
s390x: FAILED (see build-s390x.log.xz attachment)
x86_64: FAILED (see build-x86_64.log.xz attachment)
We hope that these logs can help you find the problem quickly. For the full
detail on our testing procedures, please scroll to the bottom of this message.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
rpmbuild arguments: rpmbuild --target aarch64 --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
ppc64le:
rpmbuild arguments: rpmbuild --target ppc64le --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
s390x:
rpmbuild arguments: rpmbuild --target s390x --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
x86_64:
rpmbuild arguments: rpmbuild --target x86_64 --with=kabidw_base --without=debug
3 years, 10 months
❌ FAIL: Test report for kernel (ark)
by CKI Project
Hello,
We ran automated tests on a recent commit from this kernel tree:
Kernel repo: https://gitlab.com/cki-project/kernel-ark.git
Commit: fc35feb92ae7 - [redhat] kernel-5.8.0-0.rc0.20200612gitb791d1bdf921.1
The results of these automated tests are provided below.
Overall result: FAILED (see details below)
Merge: OK
Compile: FAILED
All kernel binaries, config files, and logs are available for download here:
https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawa...
We attempted to compile the kernel for multiple architectures, but the compile
failed on one or more architectures:
aarch64: FAILED (see build-aarch64.log.xz attachment)
ppc64le: FAILED (see build-ppc64le.log.xz attachment)
s390x: FAILED (see build-s390x.log.xz attachment)
x86_64: FAILED (see build-x86_64.log.xz attachment)
We hope that these logs can help you find the problem quickly. For the full
detail on our testing procedures, please scroll to the bottom of this message.
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.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
Compile testing
---------------
We compiled the kernel for 4 architectures:
aarch64:
rpmbuild arguments: rpmbuild --target aarch64 --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
ppc64le:
rpmbuild arguments: rpmbuild --target ppc64le --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
s390x:
rpmbuild arguments: rpmbuild --target s390x --with=cross --with=kabidw_base --without=bpftool --without=selftests --without=debug --without=ipaclones --without=perf --without=tools
x86_64:
rpmbuild arguments: rpmbuild --target x86_64 --with=kabidw_base --without=debug
3 years, 10 months
[OS-BUILD PATCH] [redhat] New configs in drivers/input
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_KEYBOARD_BCM:
Say Y here if you want to use Broadcom keypad.
To compile this driver as a module, choose M here: the
module will be called bcm-keypad.
Symbol: KEYBOARD_BCM [=n]
Type : tristate
Defined at drivers/input/keyboard/Kconfig:774
Prompt: Broadcom keypad driver
Depends on: !UML && INPUT [=y] && INPUT_KEYBOARD [=y] && OF [=y] && HAVE_CLK [=y]
Location:
-> Device Drivers
-> Input device support
-> Generic input layer (needed for keyboard, mouse, ...) (INPUT [=y])
-> Keyboards (INPUT_KEYBOARD [=y])
Selects: INPUT_MATRIXKMAP [=n]
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_KEYBOARD_BCM | 1 +
.../generic/CONFIG_KEYBOARD_BCM | 22 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_KEYBOARD_BCM
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_KEYBOARD_BCM
diff --git a/redhat/configs/common/generic/CONFIG_KEYBOARD_BCM b/redhat/configs/common/generic/CONFIG_KEYBOARD_BCM
new file mode 100644
index 000000000000..d904364b517f
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_KEYBOARD_BCM
@@ -0,0 +1 @@
+# CONFIG_KEYBOARD_BCM is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_KEYBOARD_BCM b/redhat/configs/pending-common/generic/CONFIG_KEYBOARD_BCM
deleted file mode 100644
index 956a797154b1..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_KEYBOARD_BCM
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_KEYBOARD_BCM:
-#
-# Say Y here if you want to use Broadcom keypad.
-#
-# To compile this driver as a module, choose M here: the
-# module will be called bcm-keypad.
-#
-# Symbol: KEYBOARD_BCM [=n]
-# Type : tristate
-# Defined at drivers/input/keyboard/Kconfig:774
-# Prompt: Broadcom keypad driver
-# Depends on: !UML && INPUT [=y] && INPUT_KEYBOARD [=y] && OF [=y] && HAVE_CLK [=y]
-# Location:
-# -> Device Drivers
-# -> Input device support
-# -> Generic input layer (needed for keyboard, mouse, ...) (INPUT [=y])
-# -> Keyboards (INPUT_KEYBOARD [=y])
-# Selects: INPUT_MATRIXKMAP [=n]
-#
-#
-#
-# CONFIG_KEYBOARD_BCM is not set
--
2.27.0
3 years, 10 months
[OS-BUILD PATCH] [redhat] New configs in drivers/power
by GitLab Bridge on behalf of jmflinuxtx
From: "Justin M. Forbes" <jforbes(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_BATTERY_CW2015:
Say Y here to enable support for the cellwise cw2015
battery fuel gauge (used in the Pinebook Pro & others)
This driver can also be built as a module. If so, the module will be
called cw2015_battery.
Symbol: BATTERY_CW2015 [=n]
Type : tristate
Defined at drivers/power/supply/Kconfig:119
Prompt: CW2015 Battery driver
Depends on: POWER_SUPPLY [=y] && I2C [=y]
Location:
-> Device Drivers
-> Power supply class support (POWER_SUPPLY [=y])
Selects: REGMAP_I2C [=m]
---
CONFIG_CHARGER_BD99954:
Say Y here to enable support for getting battery and charger
information and altering charger configurations from the ROHM
BD99954 charger IC.
Symbol: CHARGER_BD99954 [=n]
Type : tristate
Defined at drivers/power/supply/Kconfig:724
Prompt: ROHM bd99954 charger driver
Depends on: POWER_SUPPLY [=y] && I2C [=y]
Location:
-> Device Drivers
-> Power supply class support (POWER_SUPPLY [=y])
Selects: LINEAR_RANGES [=n]
---
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
.../common/generic/CONFIG_BATTERY_CW2015 | 1 +
.../common/generic/CONFIG_CHARGER_BD99954 | 1 +
.../generic/CONFIG_BATTERY_CW2015 | 21 -------------------
.../generic/CONFIG_CHARGER_BD99954 | 19 -----------------
4 files changed, 2 insertions(+), 40 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_BATTERY_CW2015
create mode 100644 redhat/configs/common/generic/CONFIG_CHARGER_BD99954
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_BATTERY_CW2015
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CHARGER_BD99954
diff --git a/redhat/configs/common/generic/CONFIG_BATTERY_CW2015 b/redhat/configs/common/generic/CONFIG_BATTERY_CW2015
new file mode 100644
index 000000000000..2c8831e4d2c1
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_BATTERY_CW2015
@@ -0,0 +1 @@
+# CONFIG_BATTERY_CW2015 is not set
diff --git a/redhat/configs/common/generic/CONFIG_CHARGER_BD99954 b/redhat/configs/common/generic/CONFIG_CHARGER_BD99954
new file mode 100644
index 000000000000..50cfb7bcf116
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CHARGER_BD99954
@@ -0,0 +1 @@
+# CONFIG_CHARGER_BD99954 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_BATTERY_CW2015 b/redhat/configs/pending-common/generic/CONFIG_BATTERY_CW2015
deleted file mode 100644
index 14bad46d572d..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_BATTERY_CW2015
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_BATTERY_CW2015:
-#
-# Say Y here to enable support for the cellwise cw2015
-# battery fuel gauge (used in the Pinebook Pro & others)
-#
-# This driver can also be built as a module. If so, the module will be
-# called cw2015_battery.
-#
-# Symbol: BATTERY_CW2015 [=n]
-# Type : tristate
-# Defined at drivers/power/supply/Kconfig:119
-# Prompt: CW2015 Battery driver
-# Depends on: POWER_SUPPLY [=y] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> Power supply class support (POWER_SUPPLY [=y])
-# Selects: REGMAP_I2C [=m]
-#
-#
-#
-# CONFIG_BATTERY_CW2015 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CHARGER_BD99954 b/redhat/configs/pending-common/generic/CONFIG_CHARGER_BD99954
deleted file mode 100644
index a66a599d86e4..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CHARGER_BD99954
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_CHARGER_BD99954:
-#
-# Say Y here to enable support for getting battery and charger
-# information and altering charger configurations from the ROHM
-# BD99954 charger IC.
-#
-# Symbol: CHARGER_BD99954 [=n]
-# Type : tristate
-# Defined at drivers/power/supply/Kconfig:724
-# Prompt: ROHM bd99954 charger driver
-# Depends on: POWER_SUPPLY [=y] && I2C [=y]
-# Location:
-# -> Device Drivers
-# -> Power supply class support (POWER_SUPPLY [=y])
-# Selects: LINEAR_RANGES [=n]
-#
-#
-#
-# CONFIG_CHARGER_BD99954 is not set
--
2.27.0
3 years, 10 months
[OS-BUILD PATCH] Fix PATCHLEVEL for merge window
by GitLab Bridge on behalf of jmflinuxtx
From: "Justin M. Forbes" <jforbes(a)fedoraproject.org>
When building during the merge window, we need to bump PATCHLEVEL in the
Makefile because Linus doesn't bump it until rc1. Something similar has
been in the Fedora spec forever. Using 5.8 as an example, without this
change we build a kernel rpm version
kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.fc33 but with a uname of
kernel-5.7.0-0.rc0.20200608gitaf7b4801030c.1.fc33 which places the
modules in the rpm versioned directory where the kernel does not know to
look for them. With this change, both the rpm and the uname would be
the kernel-5.8 version.
While it might be cleaner to only run this replacement if we are in the
merge window, this is much simpler than making changes across 2
additional Makefiles, and the end result should always be the same.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/kernel.spec.template | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 9f63ea14ddd1..c9eb8f1fca2e 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -71,6 +71,9 @@ Summary: The Linux kernel
%define rpmversion %%KVERSION%%.%%KPATCHLEVEL%%.%%KSUBLEVEL%%
%define pkgrelease %%PKGRELEASE%%
+# This is needed to do merge window version magic
+%define patchlevel %%KPATCHLEVEL%%
+
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease %%SPECRELEASE%%
@@ -1359,6 +1362,10 @@ BuildKernel() {
ShortRel=$(perl -e "print \"%{release}\" =~ s/\.pr\.[0-9A-Fa-f]{32}//r")
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${ShortRel}.%{_target_cpu}${Flav}/" Makefile
+ # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme
+ # if we are post rc1 this should match anyway so this won't matter
+ perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{patchlevel}/' Makefile
+
# and now to start the build process
%{make} %{?_smp_mflags} mrproper
--
2.27.0
3 years, 10 months