[OS-BUILD PATCH] Disable bluetooth highspeed by default
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)gmail.com>
Upstream has disabled BT_HS by disabled because it wasn't widely adopted.
It's also been referenced upstream by BleedingTooth vulnerability:
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa...
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
---
redhat/configs/common/generic/CONFIG_BT_HS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/redhat/configs/common/generic/CONFIG_BT_HS b/redhat/configs/common/generic/CONFIG_BT_HS
index e0151a2e9e0d..fbbd6bcf002f 100644
--- a/redhat/configs/common/generic/CONFIG_BT_HS
+++ b/redhat/configs/common/generic/CONFIG_BT_HS
@@ -1 +1 @@
-CONFIG_BT_HS=y
+# CONFIG_BT_HS is not set
--
GitLab
3 years, 1 month
[OS-BUILD PATCH] [redhat] New configs in arch/powerpc
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_CMDLINE:
On some platforms, there is currently no way for the boot loader to
pass arguments to the kernel. For these platforms, you can supply
some command-line options at build time by entering them here. In
most cases you will need to specify the root device here.
Symbol: CMDLINE [=]
Type : string
Defined at arch/powerpc/Kconfig:882
Prompt: Initial kernel command string
Location:
-> Kernel options
---
CONFIG_PPC_QUEUED_SPINLOCKS:
Say Y here to use queued spinlocks which give better scalability and
fairness on large SMP and NUMA systems without harming single threaded
performance.
This option is currently experimental, the code is more complex and
less tested so it defaults to "N" for the moment.
If unsure, say "N".
Symbol: PPC_QUEUED_SPINLOCKS [=n]
Type : bool
Defined at arch/powerpc/Kconfig:497
Prompt: Queued spinlocks
Depends on: SMP [=y]
Location:
-> Kernel options
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_CMDLINE | 1 +
.../generic/CONFIG_PPC_QUEUED_SPINLOCKS | 1 +
.../pending-common/generic/CONFIG_CMDLINE | 17 --------------
.../generic/CONFIG_PPC_QUEUED_SPINLOCKS | 22 -------------------
4 files changed, 2 insertions(+), 39 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_CMDLINE
create mode 100644 redhat/configs/common/generic/CONFIG_PPC_QUEUED_SPINLOCKS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CMDLINE
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_PPC_QUEUED_SPINLOCKS
diff --git a/redhat/configs/common/generic/CONFIG_CMDLINE b/redhat/configs/common/generic/CONFIG_CMDLINE
new file mode 100644
index 000000000000..f3083e1e5200
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CMDLINE
@@ -0,0 +1 @@
+CONFIG_CMDLINE=""
diff --git a/redhat/configs/common/generic/CONFIG_PPC_QUEUED_SPINLOCKS b/redhat/configs/common/generic/CONFIG_PPC_QUEUED_SPINLOCKS
new file mode 100644
index 000000000000..f1f7e79da5c3
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PPC_QUEUED_SPINLOCKS
@@ -0,0 +1 @@
+# CONFIG_PPC_QUEUED_SPINLOCKS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_CMDLINE b/redhat/configs/pending-common/generic/CONFIG_CMDLINE
deleted file mode 100644
index 10611732c5eb..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CMDLINE
+++ /dev/null
@@ -1,17 +0,0 @@
-# CONFIG_CMDLINE:
-#
-# On some platforms, there is currently no way for the boot loader to
-# pass arguments to the kernel. For these platforms, you can supply
-# some command-line options at build time by entering them here. In
-# most cases you will need to specify the root device here.
-#
-# Symbol: CMDLINE [=]
-# Type : string
-# Defined at arch/powerpc/Kconfig:882
-# Prompt: Initial kernel command string
-# Location:
-# -> Kernel options
-#
-#
-#
-CONFIG_CMDLINE=""
diff --git a/redhat/configs/pending-common/generic/CONFIG_PPC_QUEUED_SPINLOCKS b/redhat/configs/pending-common/generic/CONFIG_PPC_QUEUED_SPINLOCKS
deleted file mode 100644
index 90ecdc77e696..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_PPC_QUEUED_SPINLOCKS
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_PPC_QUEUED_SPINLOCKS:
-#
-# Say Y here to use queued spinlocks which give better scalability and
-# fairness on large SMP and NUMA systems without harming single threaded
-# performance.
-#
-# This option is currently experimental, the code is more complex and
-# less tested so it defaults to "N" for the moment.
-#
-# If unsure, say "N".
-#
-# Symbol: PPC_QUEUED_SPINLOCKS [=n]
-# Type : bool
-# Defined at arch/powerpc/Kconfig:497
-# Prompt: Queued spinlocks
-# Depends on: SMP [=y]
-# Location:
-# -> Kernel options
-#
-#
-#
-# CONFIG_PPC_QUEUED_SPINLOCKS is not set
--
GitLab
3 years, 2 months
[OS-BUILD PATCH] [redhat] New configs in kernel/trace
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_FTRACE_RECORD_RECURSION:
All callbacks that attach to the function tracing have some sort
of protection against recursion. Even though the protection exists,
it adds overhead. This option will create a file in the tracefs
file system called "recursed_functions" that will list the functions
that triggered a recursion.
This will add more overhead to cases that have recursion.
If unsure, say N
Symbol: FTRACE_RECORD_RECURSION [=n]
Type : bool
Defined at kernel/trace/Kconfig:737
Prompt: Record functions that recurse in function tracing
Depends on: TRACING_SUPPORT [=y] && FTRACE [=y] && FUNCTION_TRACER [=y]
Location:
-> Kernel hacking
-> Tracers (FTRACE [=y])
---
CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS:
This will audit the time stamps on the ring buffer sub
buffer to make sure that all the time deltas for the
events on a sub buffer matches the current time stamp.
This audit is performed for every event that is not
interrupted, or interrupting another event. A check
is also made when traversing sub buffers to make sure
that all the deltas on the previous sub buffer do not
add up to be greater than the current time stamp.
NOTE: This adds significant overhead to recording of events,
and should only be used to test the logic of the ring buffer.
Do not use it on production systems.
Only say Y if you understand what this does, and you
still want it enabled. Otherwise say N
Symbol: RING_BUFFER_VALIDATE_TIME_DELTAS [=n]
Type : bool
Defined at kernel/trace/Kconfig:846
Prompt: Verify ring buffer time stamp deltas
Depends on: TRACING_SUPPORT [=y] && FTRACE [=y] && RING_BUFFER [=y]
Location:
-> Kernel hacking
-> Tracers (FTRACE [=y])
---
Cc: Jerome Marchand <jmarchan(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_FTRACE_RECORD_RECURSION | 1 +
.../CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS | 1 +
.../generic/CONFIG_FTRACE_RECORD_RECURSION | 24 ---------------
.../CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS | 30 -------------------
4 files changed, 2 insertions(+), 54 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_FTRACE_RECORD_RECURSION
create mode 100644 redhat/configs/common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_FTRACE_RECORD_RECURSION
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
diff --git a/redhat/configs/common/generic/CONFIG_FTRACE_RECORD_RECURSION b/redhat/configs/common/generic/CONFIG_FTRACE_RECORD_RECURSION
new file mode 100644
index 000000000000..613dd9d01aef
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_FTRACE_RECORD_RECURSION
@@ -0,0 +1 @@
+# CONFIG_FTRACE_RECORD_RECURSION is not set
diff --git a/redhat/configs/common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS b/redhat/configs/common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
new file mode 100644
index 000000000000..062dee43468f
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
@@ -0,0 +1 @@
+# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_FTRACE_RECORD_RECURSION b/redhat/configs/pending-common/generic/CONFIG_FTRACE_RECORD_RECURSION
deleted file mode 100644
index d4b4d5a8a0da..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_FTRACE_RECORD_RECURSION
+++ /dev/null
@@ -1,24 +0,0 @@
-# CONFIG_FTRACE_RECORD_RECURSION:
-#
-# All callbacks that attach to the function tracing have some sort
-# of protection against recursion. Even though the protection exists,
-# it adds overhead. This option will create a file in the tracefs
-# file system called "recursed_functions" that will list the functions
-# that triggered a recursion.
-#
-# This will add more overhead to cases that have recursion.
-#
-# If unsure, say N
-#
-# Symbol: FTRACE_RECORD_RECURSION [=n]
-# Type : bool
-# Defined at kernel/trace/Kconfig:737
-# Prompt: Record functions that recurse in function tracing
-# Depends on: TRACING_SUPPORT [=y] && FTRACE [=y] && FUNCTION_TRACER [=y]
-# Location:
-# -> Kernel hacking
-# -> Tracers (FTRACE [=y])
-#
-#
-#
-# CONFIG_FTRACE_RECORD_RECURSION is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS b/redhat/configs/pending-common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
deleted file mode 100644
index 383636599d30..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS
+++ /dev/null
@@ -1,30 +0,0 @@
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS:
-#
-# This will audit the time stamps on the ring buffer sub
-# buffer to make sure that all the time deltas for the
-# events on a sub buffer matches the current time stamp.
-# This audit is performed for every event that is not
-# interrupted, or interrupting another event. A check
-# is also made when traversing sub buffers to make sure
-# that all the deltas on the previous sub buffer do not
-# add up to be greater than the current time stamp.
-#
-# NOTE: This adds significant overhead to recording of events,
-# and should only be used to test the logic of the ring buffer.
-# Do not use it on production systems.
-#
-# Only say Y if you understand what this does, and you
-# still want it enabled. Otherwise say N
-#
-# Symbol: RING_BUFFER_VALIDATE_TIME_DELTAS [=n]
-# Type : bool
-# Defined at kernel/trace/Kconfig:846
-# Prompt: Verify ring buffer time stamp deltas
-# Depends on: TRACING_SUPPORT [=y] && FTRACE [=y] && RING_BUFFER [=y]
-# Location:
-# -> Kernel hacking
-# -> Tracers (FTRACE [=y])
-#
-#
-#
-# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set
--
GitLab
3 years, 2 months
[OS-BUILD PATCH] Bluetooth: L2CAP: Try harder to accept device not
knowing
options
by Bastien Nocera (via Email Bridge)
From: Bastien Nocera <hadess(a)hadess.net>
Bluetooth: L2CAP: Try harder to accept device not knowing options
The current implementation of L2CAP options negotiation will continue
the negotiation when a device responds with L2CAP_CONF_UNACCEPT ("unaccepted
options"), but not when the device replies with L2CAP_CONF_UNKNOWN ("unknown
options").
Trying to continue the negotiation without ERTM support will allow
Bluetooth-capable XBox One controllers (notably models 1708 and 1797)
to connect.
btmon before patch:
> ACL Data RX: Handle 256 flags 0x02 dlen 16 #64 [hci0] 59.182702
L2CAP: Connection Response (0x03) ident 2 len 8
Destination CID: 64
Source CID: 64
Result: Connection successful (0x0000)
Status: No further information available (0x0000)
< ACL Data TX: Handle 256 flags 0x00 dlen 23 #65 [hci0] 59.182744
L2CAP: Configure Request (0x04) ident 3 len 15
Destination CID: 64
Flags: 0x0000
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Basic (0x00)
TX window size: 0
Max transmit: 0
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 0
> ACL Data RX: Handle 256 flags 0x02 dlen 16 #66 [hci0] 59.183948
L2CAP: Configure Request (0x04) ident 1 len 8
Destination CID: 64
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1480
< ACL Data TX: Handle 256 flags 0x00 dlen 18 #67 [hci0] 59.183994
L2CAP: Configure Response (0x05) ident 1 len 10
Source CID: 64
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1480
> ACL Data RX: Handle 256 flags 0x02 dlen 15 #69 [hci0] 59.187676
L2CAP: Configure Response (0x05) ident 3 len 7
Source CID: 64
Flags: 0x0000
Result: Failure - unknown options (0x0003)
04 .
< ACL Data TX: Handle 256 flags 0x00 dlen 12 #70 [hci0] 59.187722
L2CAP: Disconnection Request (0x06) ident 4 len 4
Destination CID: 64
Source CID: 64
> ACL Data RX: Handle 256 flags 0x02 dlen 12 #73 [hci0] 59.192714
L2CAP: Disconnection Response (0x07) ident 4 len 4
Destination CID: 64
Source CID: 64
btmon after patch:
> ACL Data RX: Handle 256 flags 0x02 dlen 16 #248 [hci0] 103.502970
L2CAP: Connection Response (0x03) ident 5 len 8
Destination CID: 65
Source CID: 65
Result: Connection pending (0x0001)
Status: No further information available (0x0000)
> ACL Data RX: Handle 256 flags 0x02 dlen 16 #249 [hci0] 103.504184
L2CAP: Connection Response (0x03) ident 5 len 8
Destination CID: 65
Source CID: 65
Result: Connection successful (0x0000)
Status: No further information available (0x0000)
< ACL Data TX: Handle 256 flags 0x00 dlen 23 #250 [hci0] 103.504398
L2CAP: Configure Request (0x04) ident 6 len 15
Destination CID: 65
Flags: 0x0000
Option: Retransmission and Flow Control (0x04) [mandatory]
Mode: Basic (0x00)
TX window size: 0
Max transmit: 0
Retransmission timeout: 0
Monitor timeout: 0
Maximum PDU size: 0
> ACL Data RX: Handle 256 flags 0x02 dlen 16 #251 [hci0] 103.505472
L2CAP: Configure Request (0x04) ident 3 len 8
Destination CID: 65
Flags: 0x0000
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1480
< ACL Data TX: Handle 256 flags 0x00 dlen 18 #252 [hci0] 103.505689
L2CAP: Configure Response (0x05) ident 3 len 10
Source CID: 65
Flags: 0x0000
Result: Success (0x0000)
Option: Maximum Transmission Unit (0x01) [mandatory]
MTU: 1480
> ACL Data RX: Handle 256 flags 0x02 dlen 15 #254 [hci0] 103.509165
L2CAP: Configure Response (0x05) ident 6 len 7
Source CID: 65
Flags: 0x0000
Result: Failure - unknown options (0x0003)
04 .
< ACL Data TX: Handle 256 flags 0x00 dlen 12 #255 [hci0] 103.509426
L2CAP: Configure Request (0x04) ident 7 len 4
Destination CID: 65
Flags: 0x0000
< ACL Data TX: Handle 256 flags 0x00 dlen 12 #257 [hci0] 103.511870
L2CAP: Connection Request (0x02) ident 8 len 4
PSM: 1 (0x0001)
Source CID: 66
> ACL Data RX: Handle 256 flags 0x02 dlen 14 #259 [hci0] 103.514121
L2CAP: Configure Response (0x05) ident 7 len 6
Source CID: 65
Flags: 0x0000
Result: Success (0x0000)
Upstream Status: bluetooth/bluetooth-next.git
(cherry picked from commit 98d2c3e1731007acf03addf83c863df6694beb95)
Signed-off-by: Bastien Nocera <hadess(a)hadess.net>
Signed-off-by: Florian Dollinger <dollinger.florian(a)gmx.de>
Co-developed-by: Florian Dollinger <dollinger.florian(a)gmx.de>
Reviewed-by: Luiz Augusto Von Dentz <luiz.von.dentz(a)intel.com>
Signed-off-by: Marcel Holtmann <marcel(a)holtmann.org>
diff a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -4519,6 +4519,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,
}
goto done;
+ case L2CAP_CONF_UNKNOWN:
case L2CAP_CONF_UNACCEPT:
if (chan->num_conf_rsp <= L2CAP_CONF_MAX_CONF_RSP) {
char req[64];
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/872
3 years, 2 months
[OS-BUILD PATCH] [redhat] New configs in drivers/net/ethernet/chelsio
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_CHELSIO_INLINE_CRYPTO:
Enable support for inline crypto.
Allows enable/disable from list of inline crypto drivers.
Symbol: CHELSIO_INLINE_CRYPTO [=y]
Type : bool
Defined at drivers/net/ethernet/chelsio/inline_crypto/Kconfig:6
Prompt: Chelsio Inline Crypto support
Depends on: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CHELSIO [=y] && CHELSIO_T4 [=m]
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> Ethernet driver support (ETHERNET [=y])
-> Chelsio devices (NET_VENDOR_CHELSIO [=y])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_CHELSIO_INLINE_CRYPTO | 1 +
.../generic/CONFIG_CHELSIO_INLINE_CRYPTO | 19 -------------------
2 files changed, 1 insertion(+), 19 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_CHELSIO_INLINE_CRYPTO
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CHELSIO_INLINE_CRYPTO
diff --git a/redhat/configs/common/generic/CONFIG_CHELSIO_INLINE_CRYPTO b/redhat/configs/common/generic/CONFIG_CHELSIO_INLINE_CRYPTO
new file mode 100644
index 000000000000..bd32df3059f2
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_CHELSIO_INLINE_CRYPTO
@@ -0,0 +1 @@
+CONFIG_CHELSIO_INLINE_CRYPTO=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_CHELSIO_INLINE_CRYPTO b/redhat/configs/pending-common/generic/CONFIG_CHELSIO_INLINE_CRYPTO
deleted file mode 100644
index 95b39e771a2a..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_CHELSIO_INLINE_CRYPTO
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_CHELSIO_INLINE_CRYPTO:
-#
-# Enable support for inline crypto.
-# Allows enable/disable from list of inline crypto drivers.
-#
-# Symbol: CHELSIO_INLINE_CRYPTO [=y]
-# Type : bool
-# Defined at drivers/net/ethernet/chelsio/inline_crypto/Kconfig:6
-# Prompt: Chelsio Inline Crypto support
-# Depends on: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CHELSIO [=y] && CHELSIO_T4 [=m]
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> Ethernet driver support (ETHERNET [=y])
-# -> Chelsio devices (NET_VENDOR_CHELSIO [=y])
-#
-#
-#
-CONFIG_CHELSIO_INLINE_CRYPTO=y
--
GitLab
3 years, 2 months
[OS-BUILD PATCH] [redhat] New configs in drivers/perf
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_ARM_DMC620_PMU:
Support for PMU events monitoring on the ARM DMC-620 memory
controller.
Symbol: ARM_DMC620_PMU [=n]
Type : tristate
Defined at drivers/perf/Kconfig:133
Prompt: Enable PMU support for the ARM DMC-620 memory controller
Depends on: PERF_EVENTS [=y] && (ARM64 [=y] && ACPI [=y] || COMPILE_TEST [=n])
Location:
-> Device Drivers
-> Performance monitor support
---
Cc: Mark Salter <msalter(a)redhat.com>
Cc: Mark Langsdorf <mlangsdo(a)redhat.com>
Cc: Jeremy Linton <jlinton(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_ARM_DMC620_PMU | 1 +
.../generic/CONFIG_ARM_DMC620_PMU | 17 -----------------
2 files changed, 1 insertion(+), 17 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_ARM_DMC620_PMU
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_ARM_DMC620_PMU
diff --git a/redhat/configs/common/generic/CONFIG_ARM_DMC620_PMU b/redhat/configs/common/generic/CONFIG_ARM_DMC620_PMU
new file mode 100644
index 000000000000..a7163f24fe2d
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_ARM_DMC620_PMU
@@ -0,0 +1 @@
+# CONFIG_ARM_DMC620_PMU is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_ARM_DMC620_PMU b/redhat/configs/pending-common/generic/CONFIG_ARM_DMC620_PMU
deleted file mode 100644
index a086d46317e9..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_ARM_DMC620_PMU
+++ /dev/null
@@ -1,17 +0,0 @@
-# CONFIG_ARM_DMC620_PMU:
-#
-# Support for PMU events monitoring on the ARM DMC-620 memory
-# controller.
-#
-# Symbol: ARM_DMC620_PMU [=n]
-# Type : tristate
-# Defined at drivers/perf/Kconfig:133
-# Prompt: Enable PMU support for the ARM DMC-620 memory controller
-# Depends on: PERF_EVENTS [=y] && (ARM64 [=y] && ACPI [=y] || COMPILE_TEST [=n])
-# Location:
-# -> Device Drivers
-# -> Performance monitor support
-#
-#
-#
-# CONFIG_ARM_DMC620_PMU is not set
--
GitLab
3 years, 2 months
[OS-BUILD PATCH] Remove deprecated Intel MIC config options
by GitLab Bridge on behalf of pbrobinson
From: Peter Robinson <pbrobinson(a)redhat.com>
The Intel MIC drivers were removed in 5.10, in commit 80ade22,
so these driver configs are now irrelvent so remove them. This
primarilly affects Fedora as they were disabled in ARK anyway.
Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com>
---
redhat/configs/ark/generic/CONFIG_INTEL_MIC_BUS | 1 -
redhat/configs/ark/generic/CONFIG_SCIF_BUS | 1 -
redhat/configs/common/generic/CONFIG_VOP_BUS | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_BUS | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_CARD | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_HOST | 1 -
.../configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_MIC_COSM | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF_BUS | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP | 1 -
redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP_BUS | 1 -
12 files changed, 12 deletions(-)
delete mode 100644 redhat/configs/ark/generic/CONFIG_INTEL_MIC_BUS
delete mode 100644 redhat/configs/ark/generic/CONFIG_SCIF_BUS
delete mode 100644 redhat/configs/common/generic/CONFIG_VOP_BUS
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_BUS
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_CARD
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_HOST
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_MIC_COSM
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF_BUS
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP
delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP_BUS
diff --git a/redhat/configs/ark/generic/CONFIG_INTEL_MIC_BUS b/redhat/configs/ark/generic/CONFIG_INTEL_MIC_BUS
deleted file mode 100644
index 0939473b1553..000000000000
--- a/redhat/configs/ark/generic/CONFIG_INTEL_MIC_BUS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_INTEL_MIC_BUS is not set
diff --git a/redhat/configs/ark/generic/CONFIG_SCIF_BUS b/redhat/configs/ark/generic/CONFIG_SCIF_BUS
deleted file mode 100644
index d6a88748b388..000000000000
--- a/redhat/configs/ark/generic/CONFIG_SCIF_BUS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCIF_BUS is not set
diff --git a/redhat/configs/common/generic/CONFIG_VOP_BUS b/redhat/configs/common/generic/CONFIG_VOP_BUS
deleted file mode 100644
index 111a702b5999..000000000000
--- a/redhat/configs/common/generic/CONFIG_VOP_BUS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VOP_BUS is not set
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_BUS b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_BUS
deleted file mode 100644
index 0d018fbf4fd8..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_BUS=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_CARD b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_CARD
deleted file mode 100644
index ce7cbb77ade3..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_CARD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_CARD=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_HOST b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_HOST
deleted file mode 100644
index 26e9b3ccff00..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_HOST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_HOST=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
deleted file mode 100644
index df573d1ab0a7..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_INTEL_MIC_X100_DMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INTEL_MIC_X100_DMA=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_MIC_COSM b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_MIC_COSM
deleted file mode 100644
index 826edffcdc91..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_MIC_COSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MIC_COSM=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF
deleted file mode 100644
index 74fab518255e..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCIF=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF_BUS b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF_BUS
deleted file mode 100644
index 054e08ed2f57..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_SCIF_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SCIF_BUS=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP
deleted file mode 100644
index 3f6192e2b20e..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VOP=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP_BUS b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP_BUS
deleted file mode 100644
index 83c12391bd88..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_VOP_BUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VOP_BUS=m
--
GitLab
3 years, 3 months
[OS-BUILD PATCH] Remove bpf-helpers.7 from bpftool package
by Jiri Olsa (via Email Bridge)
From: Jiri Olsa <jolsa(a)kernel.org>
Remove bpf-helpers.7 from bpftool package
It's packaged by man-pages. Removing bpf-helpers.7 from
bpftool package (rhbz #1686954, #1918707).
Signed-off-by: Jiri Olsa <jolsa(a)redhat.com>
diff a/redhat/kernel.spec.template b/redhat/kernel.spec.template
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2295,6 +2295,8 @@ popd
pushd tools/bpf/bpftool
%{bpftool_make} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install doc-install
popd
+# man-pages packages this (rhbz #1686954, #1918707)
+rm %{buildroot}%{_mandir}/man7/bpf-helpers.7
%endif
%if %{with_selftests}
@@ -2621,7 +2623,6 @@ fi
%{_mandir}/man8/bpftool-prog.8.gz
%{_mandir}/man8/bpftool-perf.8.gz
%{_mandir}/man8/bpftool.8.gz
-%{_mandir}/man7/bpf-helpers.7.gz
%{_mandir}/man8/bpftool-net.8.gz
%{_mandir}/man8/bpftool-feature.8.gz
%{_mandir}/man8/bpftool-btf.8.gz
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/876
3 years, 3 months