[OS-BUILD PATCH] New configs in arch/powerpc
by GitLab Bridge on behalf of jeremycline
From: Jeremy Cline <jcline(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_PMU_SYSFS:
This option enables sysfs file creation for PMU SPRs like MMCR* and PMC*.
Symbol: PMU_SYSFS [=n]
Type : bool
Defined at arch/powerpc/platforms/Kconfig.cputype:428
Prompt: Create PMU SPRs sysfs file
Location:
-> Processor support
Cc: kernel-patches(a)redhat.com
---
redhat/configs/common/generic/CONFIG_PMU_SYSFS | 1 +
.../pending-common/generic/CONFIG_PMU_SYSFS | 14 --------------
2 files changed, 1 insertion(+), 14 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_PMU_SYSFS
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_PMU_SYSFS
diff --git a/redhat/configs/common/generic/CONFIG_PMU_SYSFS b/redhat/configs/common/generic/CONFIG_PMU_SYSFS
new file mode 100644
index 000000000000..d192b509fed0
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_PMU_SYSFS
@@ -0,0 +1 @@
+# CONFIG_PMU_SYSFS is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_PMU_SYSFS b/redhat/configs/pending-common/generic/CONFIG_PMU_SYSFS
deleted file mode 100644
index 1f1a0f6cec8a..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_PMU_SYSFS
+++ /dev/null
@@ -1,14 +0,0 @@
-# CONFIG_PMU_SYSFS:
-#
-# This option enables sysfs file creation for PMU SPRs like MMCR* and PMC*.
-#
-# Symbol: PMU_SYSFS [=n]
-# Type : bool
-# Defined at arch/powerpc/platforms/Kconfig.cputype:428
-# Prompt: Create PMU SPRs sysfs file
-# Location:
-# -> Processor support
-#
-#
-#
-# CONFIG_PMU_SYSFS is not set
--
GitLab
2 years
[OS-BUILD PATCH] New configs in arch/powerpc
by GitLab Bridge on behalf of jeremycline
From: Jeremy Cline <jcline(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_COMPAT:
Enable support for 32bit binaries
Symbol: COMPAT [=n]
Type : bool
Defined at arch/powerpc/Kconfig:268
Depends on: PPC64
Default: y if !CPU_LITTLE_ENDIAN
Selects: COMPAT_BINFMT_ELF
ARCH_WANT_OLD_COMPAT_IPC
COMPAT_OLD_SIGACTION
Cc: kernel-patches(a)redhat.com
---
redhat/configs/common/generic/powerpc/CONFIG_COMPAT | 1 +
.../pending-common/generic/powerpc/CONFIG_COMPAT | 12 ------------
2 files changed, 1 insertion(+), 12 deletions(-)
create mode 100644 redhat/configs/common/generic/powerpc/CONFIG_COMPAT
delete mode 100644 redhat/configs/pending-common/generic/powerpc/CONFIG_COMPAT
diff --git a/redhat/configs/common/generic/powerpc/CONFIG_COMPAT b/redhat/configs/common/generic/powerpc/CONFIG_COMPAT
new file mode 100644
index 000000000000..3e041f1b653b
--- /dev/null
+++ b/redhat/configs/common/generic/powerpc/CONFIG_COMPAT
@@ -0,0 +1 @@
+# CONFIG_COMPAT is not set
diff --git a/redhat/configs/pending-common/generic/powerpc/CONFIG_COMPAT b/redhat/configs/pending-common/generic/powerpc/CONFIG_COMPAT
deleted file mode 100644
index f59088da33db..000000000000
--- a/redhat/configs/pending-common/generic/powerpc/CONFIG_COMPAT
+++ /dev/null
@@ -1,12 +0,0 @@
-# CONFIG_COMPAT:
-#
-# Enable support for 32bit binaries
-#
-# Symbol: COMPAT [=n]
-# Type : bool
-# Defined at arch/powerpc/Kconfig:268
-# Depends on: PPC64
-# Default: y if !CPU_LITTLE_ENDIAN
-# Selects: COMPAT_BINFMT_ELF, ARCH_WANT_OLD_COMPAT_IPC, COMPAT_OLD_SIGACTION
-#
-# CONFIG_COMPAT is not set
--
GitLab
2 years
[OS-BUILD PATCH] [redhat] New configs in fs/xfs
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_XFS_SUPPORT_V4:
The V4 filesystem format lacks certain features that are supported
by the V5 format, such as metadata checksumming, strengthened
metadata verification, and the ability to store timestamps past the
year 2038. Because of this, the V4 format is deprecated. All users
should upgrade by backing up their files, reformatting, and restoring
from the backup.
Administrators and users can detect a V4 filesystem by running
xfs_info against a filesystem mountpoint and checking for a string
beginning with "crc=". If the string "crc=0" is found, the
filesystem is a V4 filesystem. If no such string is found, please
upgrade xfsprogs to the latest version and try again.
This option will become default N in September 2025. Support for the
V4 format will be removed entirely in September 2030. Distributors
can say N here to withdraw support earlier.
To continue supporting the old V4 format (crc=0), say Y.
To close off an attack surface, say N.
Symbol: XFS_SUPPORT_V4 [=y]
Type : bool
Defined at fs/xfs/Kconfig:25
Prompt: Support deprecated V4 (crc=0) format
Depends on: BLOCK [=y] && XFS_FS [=m]
Location:
-> File systems
-> XFS filesystem support (XFS_FS [=m])
---
Cc: Brian Foster <bfoster(a)redhat.com>
Cc: Carlos Maiolino <cmaiolin(a)redhat.com>
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../common/generic/CONFIG_XFS_SUPPORT_V4 | 1 +
.../generic/CONFIG_XFS_SUPPORT_V4 | 34 -------------------
2 files changed, 1 insertion(+), 34 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_XFS_SUPPORT_V4
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_XFS_SUPPORT_V4
diff --git a/redhat/configs/common/generic/CONFIG_XFS_SUPPORT_V4 b/redhat/configs/common/generic/CONFIG_XFS_SUPPORT_V4
new file mode 100644
index 000000000000..12315e1fff2b
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_XFS_SUPPORT_V4
@@ -0,0 +1 @@
+CONFIG_XFS_SUPPORT_V4=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_XFS_SUPPORT_V4 b/redhat/configs/pending-common/generic/CONFIG_XFS_SUPPORT_V4
deleted file mode 100644
index aeb9b39ac5da..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_XFS_SUPPORT_V4
+++ /dev/null
@@ -1,34 +0,0 @@
-# CONFIG_XFS_SUPPORT_V4:
-#
-# The V4 filesystem format lacks certain features that are supported
-# by the V5 format, such as metadata checksumming, strengthened
-# metadata verification, and the ability to store timestamps past the
-# year 2038. Because of this, the V4 format is deprecated. All users
-# should upgrade by backing up their files, reformatting, and restoring
-# from the backup.
-#
-# Administrators and users can detect a V4 filesystem by running
-# xfs_info against a filesystem mountpoint and checking for a string
-# beginning with "crc=". If the string "crc=0" is found, the
-# filesystem is a V4 filesystem. If no such string is found, please
-# upgrade xfsprogs to the latest version and try again.
-#
-# This option will become default N in September 2025. Support for the
-# V4 format will be removed entirely in September 2030. Distributors
-# can say N here to withdraw support earlier.
-#
-# To continue supporting the old V4 format (crc=0), say Y.
-# To close off an attack surface, say N.
-#
-# Symbol: XFS_SUPPORT_V4 [=y]
-# Type : bool
-# Defined at fs/xfs/Kconfig:25
-# Prompt: Support deprecated V4 (crc=0) format
-# Depends on: BLOCK [=y] && XFS_FS [=m]
-# Location:
-# -> File systems
-# -> XFS filesystem support (XFS_FS [=m])
-#
-#
-#
-CONFIG_XFS_SUPPORT_V4=y
--
GitLab
2 years
[OS-BUILD PATCH] [redhat] New configs in net/bluetooth
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_BT_MSFTEXT:
This options enables support for the Microsoft defined HCI
vendor extensions.
Symbol: BT_MSFTEXT [=n]
Type : bool
Defined at net/bluetooth/Kconfig:96
Prompt: Enable Microsoft extensions
Depends on: NET [=y] && BT [=m]
Location:
-> Networking support (NET [=y])
-> Bluetooth subsystem support (BT [=m])
---
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
redhat/configs/common/generic/CONFIG_BT_MSFTEXT | 1 +
.../pending-common/generic/CONFIG_BT_MSFTEXT | 17 -----------------
2 files changed, 1 insertion(+), 17 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_BT_MSFTEXT
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_BT_MSFTEXT
diff --git a/redhat/configs/common/generic/CONFIG_BT_MSFTEXT b/redhat/configs/common/generic/CONFIG_BT_MSFTEXT
new file mode 100644
index 000000000000..7fae871b2426
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_BT_MSFTEXT
@@ -0,0 +1 @@
+# CONFIG_BT_MSFTEXT is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_BT_MSFTEXT b/redhat/configs/pending-common/generic/CONFIG_BT_MSFTEXT
deleted file mode 100644
index b93c24c93f7f..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_BT_MSFTEXT
+++ /dev/null
@@ -1,17 +0,0 @@
-# CONFIG_BT_MSFTEXT:
-#
-# This options enables support for the Microsoft defined HCI
-# vendor extensions.
-#
-# Symbol: BT_MSFTEXT [=n]
-# Type : bool
-# Defined at net/bluetooth/Kconfig:96
-# Prompt: Enable Microsoft extensions
-# Depends on: NET [=y] && BT [=m]
-# Location:
-# -> Networking support (NET [=y])
-# -> Bluetooth subsystem support (BT [=m])
-#
-#
-#
-# CONFIG_BT_MSFTEXT is not set
--
2.26.2
2 years
[OS-BUILD PATCH] [redhat] New configs in
drivers/net/ethernet/mellanox
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_MLX5_CLS_ACT:
mlx5 ConnectX offloads support for TC classifier action (NET_CLS_ACT),
works in both native NIC mode and Switchdev SRIOV mode.
Actions get attached to a Hardware offloaded classifiers and are
invoked after a successful classification. Actions are used to
overwrite the classification result, instantly drop or redirect and/or
reformat packets in wire speeds without involving the host cpu.
If set to N, TC offloads in both NIC and switchdev modes will be disabled.
If unsure, set to Y
Symbol: MLX5_CLS_ACT [=y]
Type : bool
Defined at drivers/net/ethernet/mellanox/mlx5/core/Kconfig:81
Prompt: MLX5 TC classifier action support
Depends on: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_MELLANOX [=y] && MLX5_ESWITCH [=y] && NET_CLS_ACT [=y]
Location:
-> Device Drivers
-> Network device support (NETDEVICES [=y])
-> Ethernet driver support (ETHERNET [=y])
-> Mellanox devices (NET_VENDOR_MELLANOX [=y])
-> Mellanox 5th generation network adapters (ConnectX series) Ethernet support (MLX5_CORE_EN [=y])
-> Mellanox Technologies MLX5 SRIOV E-Switch support (MLX5_ESWITCH [=y])
---
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
---
.../common/generic/CONFIG_MLX5_CLS_ACT | 1 +
.../generic/CONFIG_MLX5_CLS_ACT | 28 -------------------
2 files changed, 1 insertion(+), 28 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_MLX5_CLS_ACT
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_MLX5_CLS_ACT
diff --git a/redhat/configs/common/generic/CONFIG_MLX5_CLS_ACT b/redhat/configs/common/generic/CONFIG_MLX5_CLS_ACT
new file mode 100644
index 000000000000..2ff38eef7747
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_MLX5_CLS_ACT
@@ -0,0 +1 @@
+CONFIG_MLX5_CLS_ACT=y
diff --git a/redhat/configs/pending-common/generic/CONFIG_MLX5_CLS_ACT b/redhat/configs/pending-common/generic/CONFIG_MLX5_CLS_ACT
deleted file mode 100644
index 0dd0c3000053..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_MLX5_CLS_ACT
+++ /dev/null
@@ -1,28 +0,0 @@
-# CONFIG_MLX5_CLS_ACT:
-#
-# mlx5 ConnectX offloads support for TC classifier action (NET_CLS_ACT),
-# works in both native NIC mode and Switchdev SRIOV mode.
-# Actions get attached to a Hardware offloaded classifiers and are
-# invoked after a successful classification. Actions are used to
-# overwrite the classification result, instantly drop or redirect and/or
-# reformat packets in wire speeds without involving the host cpu.
-#
-# If set to N, TC offloads in both NIC and switchdev modes will be disabled.
-# If unsure, set to Y
-#
-# Symbol: MLX5_CLS_ACT [=y]
-# Type : bool
-# Defined at drivers/net/ethernet/mellanox/mlx5/core/Kconfig:81
-# Prompt: MLX5 TC classifier action support
-# Depends on: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_MELLANOX [=y] && MLX5_ESWITCH [=y] && NET_CLS_ACT [=y]
-# Location:
-# -> Device Drivers
-# -> Network device support (NETDEVICES [=y])
-# -> Ethernet driver support (ETHERNET [=y])
-# -> Mellanox devices (NET_VENDOR_MELLANOX [=y])
-# -> Mellanox 5th generation network adapters (ConnectX series) Ethernet support (MLX5_CORE_EN [=y])
-# -> Mellanox Technologies MLX5 SRIOV E-Switch support (MLX5_ESWITCH [=y])
-#
-#
-#
-CONFIG_MLX5_CLS_ACT=y
--
2.26.2
2 years
[OS-BUILD PATCH] [redhat] New configs in init/Kconfig
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_WATCH_QUEUE:
This is a general notification queue for the kernel to pass events to
userspace by splicing them into pipes. It can be used in conjunction
with watches for key/keyring change notifications and device
notifications.
See Documentation/watch_queue.rst
Symbol: WATCH_QUEUE [=n]
Type : bool
Defined at init/Kconfig:370
Prompt: General notification queue
Location:
-> General setup
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../configs/common/generic/CONFIG_WATCH_QUEUE | 1 +
.../pending-common/generic/CONFIG_WATCH_QUEUE | 20 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_WATCH_QUEUE
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_WATCH_QUEUE
diff --git a/redhat/configs/common/generic/CONFIG_WATCH_QUEUE b/redhat/configs/common/generic/CONFIG_WATCH_QUEUE
new file mode 100644
index 000000000000..4e2060b85ff3
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_WATCH_QUEUE
@@ -0,0 +1 @@
+# CONFIG_WATCH_QUEUE is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_WATCH_QUEUE b/redhat/configs/pending-common/generic/CONFIG_WATCH_QUEUE
deleted file mode 100644
index 11707e6429cb..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_WATCH_QUEUE
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG_WATCH_QUEUE:
-#
-#
-# This is a general notification queue for the kernel to pass events to
-# userspace by splicing them into pipes. It can be used in conjunction
-# with watches for key/keyring change notifications and device
-# notifications.
-#
-# See Documentation/watch_queue.rst
-#
-# Symbol: WATCH_QUEUE [=n]
-# Type : bool
-# Defined at init/Kconfig:370
-# Prompt: General notification queue
-# Location:
-# -> General setup
-#
-#
-#
-# CONFIG_WATCH_QUEUE is not set
--
GitLab
2 years
[OS-BUILD PATCH] RHMAINTAINERS: Update DMA Mapping entry
by GitLab Bridge on behalf of prarit
From: Jerry Snitselaar <jsnitsel(a)redhat.com>
I'm taking over the primary role for DMA Mapping
so update the maintainers entry.
RH-Acked-by: Myron Stowe <mstowe(a)redhat.com
RH-Acked-by: Don Dutile <ddutile(a)redhat.com>
Cc: Prarit Bhargava <prarit(a)redhat.com>
Cc: Donald Dutile <ddutile(a)redhat.com>
Signed-off-by: Jerry Snitselaar <jsnitsel(a)redhat.com>
---
redhat/rhdocs/MAINTAINERS/RHMAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
index dda356a9d5e9..df60e8537ff2 100644
--- a/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
+++ b/redhat/rhdocs/MAINTAINERS/RHMAINTAINERS
@@ -503,6 +503,7 @@ S: Maintained
F: drivers/scsi/hpsa*
DMA MAPPING SUPPORT
+M: Jerry Snitselaar <jsnitsel(a)redhat.com>
M: Donald Dutile <ddutile(a)redhat.com>
S: Maintained
F: kernel/dma/*
--
GitLab
2 years
[OS-BUILD PATCH] redhat: Implement Makefile.dist
by GitLab Bridge on behalf of prarit
From: Prarit Bhargava <prarit(a)redhat.com>
One of the nice things about the RHEL and ARK trees is that commands like
'make dist-configs' and 'make dist-help' can be executed from the
top-level linux directory.
In the existing code, the makefile includes the top-level linux Makefile
if the targets are not dist-* or distg-*. Otherwise the commands are
executed with the redhat/Makefile* files. This is clunky and requires the
inclusion of the makefile in .gitignore which causes problems when
upstream modifies .gitignore.
A better approach is to include the code in a top-level Makefile.dist.
This change can then be moved upstream for inclusion with a oneline patch
to include Makefile.dist. Makefile.dist would not be included in the
gitignore file because we want to track changes for the file in our
own tree.
Move the makefile and Makefile.rhelver code into Makefile.dist, and
include Makefile.dist from the top-level Makefile.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
Cc: dzickus(a)redhat.com
Cc: jforbes(a)redhat.com
Cc: bcrocker(a)redhat.com
---
Makefile | 6 ++----
Makefile.rhelver => Makefile.dist | 19 ++++++++++++++++++-
makefile | 16 ----------------
redhat/Makefile | 4 ++--
redhat/Makefile.common | 2 +-
redhat/genspec.sh | 2 +-
redhat/kernel.spec.template | 2 +-
redhat/scripts/new_release.sh | 12 ++++++------
8 files changed, 31 insertions(+), 32 deletions(-)
rename Makefile.rhelver => Makefile.dist (77%)
delete mode 100644 makefile
diff --git a/Makefile b/Makefile
index f3d1dd649d9b..c9a0d4f20808 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,6 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
PHONY := __all
__all:
-# Set RHEL variables
-# Use this spot to avoid future merge conflicts
-include Makefile.rhelver
-
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
@@ -273,6 +269,8 @@ no-sync-config-targets := $(no-dot-config-targets) install %install \
kernelrelease
single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.s %.symtypes %/
+-include Makefile.dist
+
config-build :=
mixed-build :=
need-config := 1
diff --git a/Makefile.rhelver b/Makefile.dist
similarity index 77%
rename from Makefile.rhelver
rename to Makefile.dist
index 8fceabade7c8..0b4f2d28e7b8 100644
--- a/Makefile.rhelver
+++ b/Makefile.dist
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 0
+RHEL_RELEASE = 1
#
# Early y+1 numbering
@@ -43,3 +43,20 @@ ifneq ("$(ZSTREAM)", "yes")
RHEL_RELEASE:=$(RHEL_RELEASE).$(EARLY_YRELEASE)
endif
endif
+
+no-dot-config-targets += dist-% distg-%
+
+ifneq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
+_OUTPUT := "."
+# this section is needed in order to make O= to work
+ifeq ("$(origin O)", "command line")
+ _OUTPUT := "$(abspath $(O))"
+ _EXTRA_ARGS := O=$(_OUTPUT)
+endif
+endif
+
+dist-%::
+ $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
+
+distg-%::
+ $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
diff --git a/makefile b/makefile
deleted file mode 100644
index 819ac9a5cd60..000000000000
--- a/makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-ifeq ($(filter dist-% distg-%,$(MAKECMDGOALS)),)
- include Makefile
-endif
-
-_OUTPUT := "."
-# this section is needed in order to make O= to work
-ifeq ("$(origin O)", "command line")
- _OUTPUT := "$(abspath $(O))"
- _EXTRA_ARGS := O=$(_OUTPUT)
-endif
-dist-%::
- $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
-
-distg-%::
- $(MAKE) -C redhat $(@) $(_EXTRA_ARGS)
-
diff --git a/redhat/Makefile b/redhat/Makefile
index 61dcc522fbc6..8c6a3a510768 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -256,7 +256,7 @@ sources-rh: $(TARBALL)
configs/process_configs.sh \
parallel_xz.sh \
generate_bls_conf.sh \
- ../Makefile.rhelver \
+ ../Makefile.dist \
README.rst \
$(SOURCES)/
@for KABIARCH in $(ARCH_LIST); do \
@@ -308,7 +308,7 @@ dist-release-finish: setup-source
@git add $(REDHAT)/$(CHANGELOG)
@echo $(MARKER) > $(REDHAT)/marker
@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 commit -s ../Makefile.dist $(REDHAT)/marker $(REDHAT)/$(CHANGELOG) $(PACKAGE_NAME).spec.template -m "[redhat] $(PACKAGE_NAME)-$(STAMP_VERSION)-$(PREBUILD)$(BUILD)$(BUILDID)"
@$(MAKE) dist-configs
@$(MAKE) dist-kabi
@$(MAKE) dist-kabi-dup
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index 6d048415ba6d..d4e68369fb05 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -1,6 +1,6 @@
TOPDIR:=$(shell git rev-parse --show-toplevel)
REDHAT:=$(TOPDIR)/redhat
-include $(TOPDIR)/Makefile.rhelver
+include $(TOPDIR)/Makefile.dist
RPMBUILD := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
else echo rpm; fi)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index b72dffe14729..1cd9095a69ea 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -253,7 +253,7 @@ if [ "$SINGLE_TARBALL" = 0 ]; then
":(exclude,top).gitignore" \
":(exclude,top).gitlab-ci.yml" \
":(exclude,top)makefile" \
- ":(exclude,top)Makefile.rhelver" \
+ ":(exclude,top)Makefile.dist" \
":(exclude,top)redhat")
for c in $COMMITS; do
patch=$(git format-patch --zero-commit -1 "$c")
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index d47c9cce8a0e..93fa8c2985b1 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-%%TARBALL_VERSION%%.tar.xz
-Source1: Makefile.rhelver
+Source1: Makefile.dist
# Name of the packaged file containing signing key
diff --git a/redhat/scripts/new_release.sh b/redhat/scripts/new_release.sh
index 1e4c7bb1dc86..f1025f458d04 100755
--- a/redhat/scripts/new_release.sh
+++ b/redhat/scripts/new_release.sh
@@ -13,7 +13,7 @@ if [ -s "$RHPATH/linux-kernel-test.patch" ]; then
exit 1;
fi
-RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p' $RHPATH/../Makefile.rhelver)
+RELEASE=$(sed -n -e 's/^RHEL_RELEASE\ =\ \(.*\)/\1/p' $RHPATH/../Makefile.dist)
YVER=$(echo $RELEASE | cut -d "." -f 1)
YVER=${YVER:=$RELEASE}
@@ -26,15 +26,15 @@ if [ "$ZSTREAM_FLAG" == "no" ]; then
if [ "$YSTREAM_FLAG" == "yes" ]; then
NEW_RELEASE="$[RELEASE + 1]";
else
- EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p' $RHPATH/../Makefile.rhelver);
- EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p' $RHPATH/../Makefile.rhelver);
+ EARLY_YBUILD=$(sed -n -e 's/^EARLY_YBUILD:=\(.*\)/\1/p' $RHPATH/../Makefile.dist);
+ EARLY_YRELEASE=$(sed -n -e 's/^EARLY_YRELEASE:=\(.*\)/\1/p' $RHPATH/../Makefile.dist);
if [ "$EARLY_YBUILD" != "$RELEASE" ]; then
NEW_EARLY_YRELEASE=1;
else
NEW_EARLY_YRELEASE="$[EARLY_YRELEASE + 1]";
fi
- sed -i -e "s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/" $RHPATH/../Makefile.rhelver;
- sed -i -e "s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/" $RHPATH/../Makefile.rhelver;
+ sed -i -e "s/^EARLY_YBUILD:=$EARLY_YBUILD/EARLY_YBUILD:=$RELEASE/" $RHPATH/../Makefile.dist;
+ sed -i -e "s/^EARLY_YRELEASE:=$EARLY_YRELEASE/EARLY_YRELEASE:=$NEW_EARLY_YRELEASE/" $RHPATH/../Makefile.dist;
NEW_RELEASE=$RELEASE;
fi
elif [ "$ZSTREAM_FLAG" == "yes" ]; then
@@ -46,5 +46,5 @@ else
exit 1;
fi
-sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/" $RHPATH/../Makefile.rhelver;
+sed -i -e "s/RHEL_RELEASE\ =.*/RHEL_RELEASE\ =\ $NEW_RELEASE/" $RHPATH/../Makefile.dist;
--
GitLab
2 years
[OS-BUILD PATCH] [redhat] New configs in drivers/nvme
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_NVME_TARGET_PASSTHRU:
This enables target side NVMe passthru controller support for the
NVMe Over Fabrics protocol. It allows for hosts to manage and
directly access an actual NVMe controller residing on the target
side, incuding executing Vendor Unique Commands.
If unsure, say N.
Symbol: NVME_TARGET_PASSTHRU [=n]
Type : bool
Defined at drivers/nvme/target/Kconfig:19
Prompt: NVMe Target Passthrough support
Depends on: NVME_TARGET [=m] && (NVME_CORE [=m]=y || NVME_CORE [=m]=NVME_TARGET [=m])
Location:
-> Device Drivers
-> NVME Support
-> NVMe Target support (NVME_TARGET [=m])
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
---
.../generic/CONFIG_NVME_TARGET_PASSTHRU | 1 +
.../generic/CONFIG_NVME_TARGET_PASSTHRU | 22 -------------------
2 files changed, 1 insertion(+), 22 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU
diff --git a/redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU b/redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU
new file mode 100644
index 000000000000..12bf02e23a41
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_NVME_TARGET_PASSTHRU
@@ -0,0 +1 @@
+# CONFIG_NVME_TARGET_PASSTHRU is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU b/redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU
deleted file mode 100644
index 2795e2bb3e5e..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_NVME_TARGET_PASSTHRU
+++ /dev/null
@@ -1,22 +0,0 @@
-# CONFIG_NVME_TARGET_PASSTHRU:
-#
-# This enables target side NVMe passthru controller support for the
-# NVMe Over Fabrics protocol. It allows for hosts to manage and
-# directly access an actual NVMe controller residing on the target
-# side, incuding executing Vendor Unique Commands.
-#
-# If unsure, say N.
-#
-# Symbol: NVME_TARGET_PASSTHRU [=n]
-# Type : bool
-# Defined at drivers/nvme/target/Kconfig:19
-# Prompt: NVMe Target Passthrough support
-# Depends on: NVME_TARGET [=m] && (NVME_CORE [=m]=y || NVME_CORE [=m]=NVME_TARGET [=m])
-# Location:
-# -> Device Drivers
-# -> NVME Support
-# -> NVMe Target support (NVME_TARGET [=m])
-#
-#
-#
-# CONFIG_NVME_TARGET_PASSTHRU is not set
--
GitLab
2 years
[OS-BUILD PATCH 0/7] Move all x86 legacy input options to that
architecture
by GitLab Bridge on behalf of pbrobinson
From: pbrobinson on gitlab.com
None of the non x86 architectures support PS2, AT keyboards, i8042
controllers and related bits. This cleans up a bunch of those options as
well as syncing some of the Fedora options on non x86 to be the same as
ARK by moving the ARK bits to generic.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
2 years