From fb5e29ef171b9e11dd2d444ea77092fe5e5ea923 Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Mon, 11 Apr 2022 09:28:43 +0000 Subject: [PATCH] kernel-5.14.0-78.el9 * Mon Apr 11 2022 Patrick Talbert [5.14.0-78.el9] - CI: Remove deprecated option (Veronika Kabatova) - scsi: iscsi: Fix nop handling during conn recovery (Chris Leech) [2069973] - scsi: iscsi: Merge suspend fields (Chris Leech) [2069973] - scsi: iscsi: Fix offload conn cleanup when iscsid restarts (Chris Leech) [2069973] - scsi: iscsi: Move iscsi_ep_disconnect (Chris Leech) [2069973] - NFS: Don't loop forever in nfs_do_recoalesce() (Steve Dickson) [2069274] - perf/x86/intel/uncore: Make uncore_discovery clean for 64 bit addresses (Michael Petlan) [2069686] - KVM: SVM: Allow AVIC support on system w/ physical APIC ID > 255 (Bandan Das) [2033070] - iommu/amd: Fix I/O page table memory leak (Jerry Snitselaar) [2053219] - iommu/amd: Recover from event log overflow (Jerry Snitselaar) [2053219] - redhat/configs: drop some config options for rhel 9. (David Airlie) [2067027] - arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Use the clearbhb instruction in mitigations (Waiman Long) [2062288] {CVE-2022-23960} - KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Mitigate spectre style branch history side channels (Waiman Long) [2062288] {CVE-2022-23960} - arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add percpu vectors for EL1 (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Add macro for reading symbol addresses from the trampoline (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Add vectors that have the bhb mitigation sequences (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Allow the trampoline text to occupy multiple pages (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Make the kpti trampoline's kpti sequence optional (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Move trampoline macros out of ifdef'd section (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Don't assume tramp_vectors is the start of the vectors (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Allow tramp_alias to access symbols after the 4K boundary (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Move the trampoline data page before the text page (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Free up another register on kpti's tramp_exit path (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry: Make the trampoline cleanup optional (Waiman Long) [2062288] {CVE-2022-23960} - KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A (Waiman Long) [2062288] {CVE-2022-23960} - arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit (Waiman Long) [2062288] {CVE-2022-23960} - arm64: entry.S: Add ventry overflow sanity checks (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add Cortex-A510 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add Cortex-X2 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} - arm64: cpufeature: add HWCAP for FEAT_RPRES (Waiman Long) [2062288] {CVE-2022-23960} - arm64: add ID_AA64ISAR2_EL1 sys register (Waiman Long) [2062288] {CVE-2022-23960} - arm64: cpufeature: add HWCAP for FEAT_AFP (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add Neoverse-N2, Cortex-A710 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} - arm64: Add HWCAP for self-synchronising virtual counter (Waiman Long) [2062288] {CVE-2022-23960} - iommu/vt-d: Fix double list_add when enabling VMD in scalable mode (Jerry Snitselaar) [2061621] - redhat/configs: remove unnecessary GPIO options for aarch64 (Brian Masney) [2060951] - redhat/configs: remove viperboard related Kconfig options (Brian Masney) [2060951] - configs: enable CONFIG_RMI4_F3A (Benjamin Tissoires) [2067243] - block: release rq qos structures for queue without disk (Ming Lei) [2065610] - fuse: fix pipe buffer lifetime for direct_io (Miklos Szeredi) [2064862] {CVE-2022-1011} - crypto: hmac - disallow keys < 112 bits in FIPS mode (Herbert Xu) [2033512] - crypto: hmac - add fips_skip support (Herbert Xu) [2033512] - crypto: des - disallow des3 in FIPS mode (Herbert Xu) [2033512] - crypto: dh - limit key size to 2048 in FIPS mode (Herbert Xu) [2033512] - crypto: rsa - limit key size to 2048 in FIPS mode (Herbert Xu) [2033512] - watch_queue: Make comment about setting ->defunct more accurate (David Howells) [2063758] - watch_queue: Fix lack of barrier/sync/lock between post and read (David Howells) [2063758] - watch_queue: Free the alloc bitmap when the watch_queue is torn down (David Howells) [2063758] - watch_queue: Fix the alloc bitmap size to reflect notes allocated (David Howells) [2063758] - watch_queue: Use the bitmap API when applicable (David Howells) [2063758] - watch_queue: Fix to always request a pow-of-2 pipe ring size (David Howells) [2063758] - watch_queue: Fix to release page in ->release() (David Howells) [2063758] - watch_queue, pipe: Free watchqueue state after clearing pipe ring (David Howells) [2063758] - watch_queue: Fix filter limit check (David Howells) [2063758] {CVE-2022-0995} - s390/mm: check 2KB-fragment page on release (Rafael Aquini) [2069978] - s390/mm: better annotate 2KB pagetable fragments handling (Rafael Aquini) [2069978] - s390/mm: fix 2KB pgtable release race (Rafael Aquini) [2069978] - ima: fix deadlock when traversing "ima_default_rules". (Bruno Meneguele) [2063913] - IMA: prevent SETXATTR_CHECK policy rules with unavailable algorithms (Bruno Meneguele) [2063913] - IMA: introduce a new policy option func=SETXATTR_CHECK (Bruno Meneguele) [2063913] - IMA: add a policy option to restrict xattr hash algorithms on appraisal (Bruno Meneguele) [2063913] - IMA: add support to restrict the hash algorithms used for file appraisal (Bruno Meneguele) [2063913] - IMA: block writes of the security.ima xattr with unsupported algorithms (Bruno Meneguele) [2063913] - IMA: remove the dependency on CRYPTO_MD5 (Bruno Meneguele) [2063913] - perf symbols: Fix symbol size calculation condition (Michael Petlan) [2049222] - redhat/Makefile: Fix dist-dump-variables target (Prarit Bhargava) - redhat/configs/process_configs.sh: Avoid race with find (Prarit Bhargava) - redhat/configs/process_configs.sh: Remove CONTINUEONERROR (Prarit Bhargava) - redhat/configs/process_configs.sh: Fix race with tools generation (Prarit Bhargava) - redhat/Makefile: Silence dist-clean-configs output (Prarit Bhargava) - Print arch with process_configs errors (Prarit Bhargava) - Pass RHJOBS to process_configs for dist-configs-check as well (Prarit Bhargava) - redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava) - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/build_configs.sh: Add local variables (Prarit Bhargava) - redhat/configs/process_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava) - cifs: modefromsids must add an ACE for authenticated users (Ronnie Sahlberg) [1988278] Resolves: rhbz#1988278, rhbz#2049222, rhbz#2063913, rhbz#2069978 Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 12 +- kernel-aarch64-rhel.config | 12 +- kernel-ppc64le-debug-rhel.config | 17 +-- kernel-ppc64le-rhel.config | 17 +-- kernel-s390x-debug-rhel.config | 13 ++- kernel-s390x-rhel.config | 13 ++- kernel-s390x-zfcpdump-rhel.config | 13 ++- kernel-x86_64-debug-rhel.config | 14 +-- kernel-x86_64-rhel.config | 14 +-- kernel.spec | 98 ++++++++++++++++- process_configs.sh | 175 +++++++++++++++++++----------- sources | 6 +- 13 files changed, 271 insertions(+), 135 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 71dd8b0fc..d4ea435fc 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 77 +RHEL_RELEASE = 78 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index f7bae7eac..cd4a6e934 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1534,14 +1534,14 @@ CONFIG_FB_EFI=y # CONFIG_FB_METRONOME is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1676,7 +1676,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set -CONFIG_GPIO_AMDPT=m +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1685,7 +1685,7 @@ CONFIG_GPIO_DWAPB=m # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set # CONFIG_GPIO_FTGPIO010 is not set -CONFIG_GPIO_GENERIC_PLATFORM=m +# CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_HISI is not set @@ -2019,7 +2019,7 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VERSATILE=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set CONFIG_I2C_XGENE_SLIMPRO=m # CONFIG_I2C_XILINX is not set CONFIG_I2C_XLP9XX=m @@ -4185,7 +4185,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 22fd1ca91..93f505333 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1518,14 +1518,14 @@ CONFIG_FB_EFI=y # CONFIG_FB_METRONOME is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1660,7 +1660,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set -CONFIG_GPIO_AMDPT=m +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1669,7 +1669,7 @@ CONFIG_GPIO_DWAPB=m # CONFIG_GPIO_EXAR is not set # CONFIG_GPIO_F7188X is not set # CONFIG_GPIO_FTGPIO010 is not set -CONFIG_GPIO_GENERIC_PLATFORM=m +# CONFIG_GPIO_GENERIC_PLATFORM is not set # CONFIG_GPIO_GRGPIO is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_HISI is not set @@ -2003,7 +2003,7 @@ CONFIG_I2C_TINY_USB=m CONFIG_I2C_VERSATILE=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set CONFIG_I2C_XGENE_SLIMPRO=m # CONFIG_I2C_XILINX is not set CONFIG_I2C_XLP9XX=m @@ -4163,7 +4163,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 0111eaf46..dba3e7932 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1375,18 +1375,18 @@ CONFIG_FB_MATROX=y # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set -CONFIG_FB_NVIDIA=m +# CONFIG_FB_NVIDIA is not set CONFIG_FB_OF=y # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set -CONFIG_FB_RADEON=m +# CONFIG_FB_RADEON is not set # CONFIG_FB_RIVA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_S3 is not set @@ -1518,6 +1518,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1559,7 +1560,7 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1844,7 +1845,7 @@ CONFIG_I2C_STUB=m CONFIG_I2C_TINY_USB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set CONFIG_I2C=y # CONFIG_I3C is not set @@ -2742,7 +2743,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -3978,7 +3979,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f57bbeab8..016e53328 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1359,18 +1359,18 @@ CONFIG_FB_MATROX=y # CONFIG_FB_METRONOME is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set -CONFIG_FB_NVIDIA=m +# CONFIG_FB_NVIDIA is not set CONFIG_FB_OF=y # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set -CONFIG_FB_RADEON=m +# CONFIG_FB_RADEON is not set # CONFIG_FB_RIVA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_S3 is not set @@ -1502,6 +1502,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1543,7 +1544,7 @@ CONFIG_GPIO_PCF857X=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1828,7 +1829,7 @@ CONFIG_I2C_STUB=m CONFIG_I2C_TINY_USB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set CONFIG_I2C=y # CONFIG_I3C is not set @@ -2724,7 +2725,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -3960,7 +3961,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 777f44e63..66ddda7e1 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1381,14 +1381,14 @@ CONFIG_FB=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1517,6 +1517,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1558,7 +1559,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1833,7 +1834,7 @@ CONFIG_I2C_MUX_MLXCPLD=m CONFIG_I2C_TINY_USB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set # CONFIG_I3C is not set CONFIG_I40E_DCB=y @@ -2732,7 +2733,7 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -3924,7 +3925,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a7e6e0f71..62d60e3ff 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1365,14 +1365,14 @@ CONFIG_FB=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1501,6 +1501,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1542,7 +1543,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1817,7 +1818,7 @@ CONFIG_I2C_MUX_MLXCPLD=m CONFIG_I2C_TINY_USB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set # CONFIG_I3C is not set CONFIG_I40E_DCB=y @@ -2714,7 +2715,7 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -3906,7 +3907,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 82155b1df..fafc798da 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1372,14 +1372,14 @@ CONFIG_FB=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1511,6 +1511,7 @@ CONFIG_GLOB=y # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set # CONFIG_GPIO_AMD_FCH is not set +# CONFIG_GPIO_AMDPT is not set # CONFIG_GPIO_BCM_XGS_IPROC is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_CADENCE is not set @@ -1552,7 +1553,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1828,7 +1829,7 @@ CONFIG_I2C_MUX_MLXCPLD=m CONFIG_I2C_TINY_USB=m # CONFIG_I2C_VIA is not set # CONFIG_I2C_VIAPRO is not set -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set # CONFIG_I3C is not set CONFIG_I40E_DCB=y @@ -2727,7 +2728,7 @@ CONFIG_MFD_SM501_GPIO=y # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -3923,7 +3924,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 5f23eac6b..eaf25a5a7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1164,7 +1164,7 @@ CONFIG_DRM_DP_CEC=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_GM12U320=m -CONFIG_DRM_GMA500=m +# CONFIG_DRM_GMA500 is not set CONFIG_DRM_GUD=m # CONFIG_DRM_HDLCD is not set # CONFIG_DRM_HISI_HIBMC is not set @@ -1481,14 +1481,14 @@ CONFIG_FB_EFI=y # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_N411 is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1666,7 +1666,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1969,7 +1969,7 @@ CONFIG_I2C_STUB=m CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set CONFIG_I2C=y # CONFIG_I3C is not set @@ -2916,7 +2916,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -4151,7 +4151,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 30088cfe0..9059af35c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1156,7 +1156,7 @@ CONFIG_DRM_DP_CEC=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_GM12U320=m -CONFIG_DRM_GMA500=m +# CONFIG_DRM_GMA500 is not set CONFIG_DRM_GUD=m # CONFIG_DRM_HDLCD is not set # CONFIG_DRM_HISI_HIBMC is not set @@ -1465,14 +1465,14 @@ CONFIG_FB_EFI=y # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_N411 is not set # CONFIG_FB_NEOMAGIC is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y +# CONFIG_FB_NVIDIA_BACKLIGHT is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_NVIDIA_I2C is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_PM3 is not set -CONFIG_FB_RADEON_BACKLIGHT=y +# CONFIG_FB_RADEON_BACKLIGHT is not set # CONFIG_FB_RADEON_DEBUG is not set # CONFIG_FB_RADEON_I2C is not set # CONFIG_FB_RADEON is not set @@ -1650,7 +1650,7 @@ CONFIG_GPIO_MLXBF2=m # CONFIG_GPIO_SYSCON is not set # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set -CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIPERBOARD is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -1953,7 +1953,7 @@ CONFIG_I2C_STUB=m CONFIG_I2C_TINY_USB=m CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m -CONFIG_I2C_VIPERBOARD=m +# CONFIG_I2C_VIPERBOARD is not set # CONFIG_I2C_XILINX is not set CONFIG_I2C=y # CONFIG_I3C is not set @@ -2896,7 +2896,7 @@ CONFIG_MFD_SM501=m # CONFIG_MFD_TPS65912_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_TQMX86 is not set -CONFIG_MFD_VIPERBOARD=m +# CONFIG_MFD_VIPERBOARD is not set CONFIG_MFD_VX855=m # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM831X_I2C is not set @@ -4130,7 +4130,7 @@ CONFIG_RMI4_F11=y CONFIG_RMI4_F12=y CONFIG_RMI4_F30=y CONFIG_RMI4_F34=y -# CONFIG_RMI4_F3A is not set +CONFIG_RMI4_F3A=y # CONFIG_RMI4_F54 is not set CONFIG_RMI4_F55=y CONFIG_RMI4_I2C=m diff --git a/kernel.spec b/kernel.spec index 8098f163f..3536b4bd5 100755 --- a/kernel.spec +++ b/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 77.el9 +%define pkgrelease 78.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 77%{?buildid}%{?dist} +%define specrelease 78%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -676,7 +676,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-77.el9.tar.xz +Source0: linux-5.14.0-78.el9.tar.xz Source1: Makefile.rhelver @@ -1346,8 +1346,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-77.el9 -c -mv linux-5.14.0-77.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-78.el9 -c +mv linux-5.14.0-78.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2966,6 +2966,94 @@ fi # # %changelog +* Mon Apr 11 2022 Patrick Talbert [5.14.0-78.el9] +- CI: Remove deprecated option (Veronika Kabatova) +- scsi: iscsi: Fix nop handling during conn recovery (Chris Leech) [2069973] +- scsi: iscsi: Merge suspend fields (Chris Leech) [2069973] +- scsi: iscsi: Fix offload conn cleanup when iscsid restarts (Chris Leech) [2069973] +- scsi: iscsi: Move iscsi_ep_disconnect (Chris Leech) [2069973] +- NFS: Don't loop forever in nfs_do_recoalesce() (Steve Dickson) [2069274] +- perf/x86/intel/uncore: Make uncore_discovery clean for 64 bit addresses (Michael Petlan) [2069686] +- KVM: SVM: Allow AVIC support on system w/ physical APIC ID > 255 (Bandan Das) [2033070] +- iommu/amd: Fix I/O page table memory leak (Jerry Snitselaar) [2053219] +- iommu/amd: Recover from event log overflow (Jerry Snitselaar) [2053219] +- redhat/configs: drop some config options for rhel 9. (David Airlie) [2067027] +- arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Use the clearbhb instruction in mitigations (Waiman Long) [2062288] {CVE-2022-23960} +- KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Mitigate spectre style branch history side channels (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Add percpu vectors for EL1 (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Add macro for reading symbol addresses from the trampoline (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Add vectors that have the bhb mitigation sequences (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Allow the trampoline text to occupy multiple pages (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Make the kpti trampoline's kpti sequence optional (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Move trampoline macros out of ifdef'd section (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Don't assume tramp_vectors is the start of the vectors (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Allow tramp_alias to access symbols after the 4K boundary (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Move the trampoline data page before the text page (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Free up another register on kpti's tramp_exit path (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry: Make the trampoline cleanup optional (Waiman Long) [2062288] {CVE-2022-23960} +- KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: entry.S: Add ventry overflow sanity checks (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Add Cortex-A510 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Add Cortex-X2 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: cpufeature: add HWCAP for FEAT_RPRES (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: add ID_AA64ISAR2_EL1 sys register (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: cpufeature: add HWCAP for FEAT_AFP (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Add Neoverse-N2, Cortex-A710 CPU part definition (Waiman Long) [2062288] {CVE-2022-23960} +- arm64: Add HWCAP for self-synchronising virtual counter (Waiman Long) [2062288] {CVE-2022-23960} +- iommu/vt-d: Fix double list_add when enabling VMD in scalable mode (Jerry Snitselaar) [2061621] +- redhat/configs: remove unnecessary GPIO options for aarch64 (Brian Masney) [2060951] +- redhat/configs: remove viperboard related Kconfig options (Brian Masney) [2060951] +- configs: enable CONFIG_RMI4_F3A (Benjamin Tissoires) [2067243] +- block: release rq qos structures for queue without disk (Ming Lei) [2065610] +- fuse: fix pipe buffer lifetime for direct_io (Miklos Szeredi) [2064862] {CVE-2022-1011} +- crypto: hmac - disallow keys < 112 bits in FIPS mode (Herbert Xu) [2033512] +- crypto: hmac - add fips_skip support (Herbert Xu) [2033512] +- crypto: des - disallow des3 in FIPS mode (Herbert Xu) [2033512] +- crypto: dh - limit key size to 2048 in FIPS mode (Herbert Xu) [2033512] +- crypto: rsa - limit key size to 2048 in FIPS mode (Herbert Xu) [2033512] +- watch_queue: Make comment about setting ->defunct more accurate (David Howells) [2063758] +- watch_queue: Fix lack of barrier/sync/lock between post and read (David Howells) [2063758] +- watch_queue: Free the alloc bitmap when the watch_queue is torn down (David Howells) [2063758] +- watch_queue: Fix the alloc bitmap size to reflect notes allocated (David Howells) [2063758] +- watch_queue: Use the bitmap API when applicable (David Howells) [2063758] +- watch_queue: Fix to always request a pow-of-2 pipe ring size (David Howells) [2063758] +- watch_queue: Fix to release page in ->release() (David Howells) [2063758] +- watch_queue, pipe: Free watchqueue state after clearing pipe ring (David Howells) [2063758] +- watch_queue: Fix filter limit check (David Howells) [2063758] {CVE-2022-0995} +- s390/mm: check 2KB-fragment page on release (Rafael Aquini) [2069978] +- s390/mm: better annotate 2KB pagetable fragments handling (Rafael Aquini) [2069978] +- s390/mm: fix 2KB pgtable release race (Rafael Aquini) [2069978] +- ima: fix deadlock when traversing "ima_default_rules". (Bruno Meneguele) [2063913] +- IMA: prevent SETXATTR_CHECK policy rules with unavailable algorithms (Bruno Meneguele) [2063913] +- IMA: introduce a new policy option func=SETXATTR_CHECK (Bruno Meneguele) [2063913] +- IMA: add a policy option to restrict xattr hash algorithms on appraisal (Bruno Meneguele) [2063913] +- IMA: add support to restrict the hash algorithms used for file appraisal (Bruno Meneguele) [2063913] +- IMA: block writes of the security.ima xattr with unsupported algorithms (Bruno Meneguele) [2063913] +- IMA: remove the dependency on CRYPTO_MD5 (Bruno Meneguele) [2063913] +- perf symbols: Fix symbol size calculation condition (Michael Petlan) [2049222] +- redhat/Makefile: Fix dist-dump-variables target (Prarit Bhargava) +- redhat/configs/process_configs.sh: Avoid race with find (Prarit Bhargava) +- redhat/configs/process_configs.sh: Remove CONTINUEONERROR (Prarit Bhargava) +- redhat/configs/process_configs.sh: Fix race with tools generation (Prarit Bhargava) +- redhat/Makefile: Silence dist-clean-configs output (Prarit Bhargava) +- Print arch with process_configs errors (Prarit Bhargava) +- Pass RHJOBS to process_configs for dist-configs-check as well (Prarit Bhargava) +- redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava) +- redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) +- redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) +- redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava) +- redhat/configs/build_configs.sh: Add local variables (Prarit Bhargava) +- redhat/configs/process_configs.sh: Parallelize execution (Prarit Bhargava) +- redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava) +- redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava) +- redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava) +- cifs: modefromsids must add an ACE for authenticated users (Ronnie Sahlberg) [1988278] + * Thu Apr 07 2022 Patrick Talbert [5.14.0-77.el9] - NFSD: Fix offset type in I/O trace points (Benjamin Coddington) [2063045] - NFSD: COMMIT operations must not return NFS?ERR_INVAL (Benjamin Coddington) [2063045] diff --git a/process_configs.sh b/process_configs.sh index 8c997a5fa..da5d18d82 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -60,6 +60,9 @@ switch_to_toplevel() checkoptions() { + count=$3 + variant=$4 + /usr/bin/awk ' /is not set/ { @@ -82,14 +85,14 @@ checkoptions() print "Found "a[1]"="a[2]" after generation, had " a[1]"="configs[a[1]]" in Source tree"; } } - ' "$1" "$2" > .mismatches + ' "$1" "$2" > .mismatches${count} checkoptions_error=false - if test -s .mismatches + if test -s .mismatches${count} then while read -r LINE do - if find ./ -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then + if find "${REDHAT}"/configs -name "$(echo "$LINE" | awk -F "=" ' { print $1 } ' | awk ' { print $2 }')" -print0 | xargs -0 grep ^ | grep -q "process_configs_known_broken"; then # This is a known broken config. # See script help warning. checkoptions_error=false @@ -97,14 +100,13 @@ checkoptions() checkoptions_error=true break fi - done < .mismatches + done < .mismatches${count} ! $checkoptions_error && return - echo "Error: Mismatches found in configuration files" - cat .mismatches - RETURNCODE=1 - [ "$CONTINUEONERROR" ] || exit 1 + sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches${count} + else + rm -f .mismatches${count} fi } @@ -218,75 +220,119 @@ function commit_new_configs() git commit -m "[redhat] AUTOMATIC: New configs" } +function process_config() +{ + local cfg + local arch + local cfgtmp + local cfgorig + local count + local variant + + cfg=$1 + count=$2 + + arch=$(head -1 "$cfg" | cut -b 3-) + + if [ "$arch" = "EMPTY" ] + then + # This arch is intentionally left blank + return + fi + + variant=$(basename "$cfg" | cut -d"-" -f3- | cut -d"." -f1) + + cfgtmp="${cfg}.tmp" + cfgorig="${cfg}.orig" + cat "$cfg" > "$cfgorig" + + echo "Processing $cfg ... " + + make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig${count} + grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count} + if test -n "$NEWOPTIONS" && test -s .newoptions${count} + then + echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count} + cat .newoptions${count} >> .errors${count} + rm .newoptions${count} + RETURNCODE=1 + fi + rm .newoptions${count} + + grep -E 'config.*warning' .listnewconfig${count} > .warnings${count} + if test -n "$CHECKWARNINGS" && test -s .warnings${count} + then + echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count} + cat .warnings${count} >> .errors${count} + rm .warnings${count} + fi + rm .warnings${count} + + rm .listnewconfig${count} + + make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1 + echo "# $arch" > "$cfgtmp" + cat "$cfgorig" >> "$cfgtmp" + if test -n "$CHECKOPTIONS" + then + checkoptions "$cfg" "$cfgtmp" "$count" "$variant" + fi + # if test run, don't overwrite original + if test -n "$TESTRUN" + then + rm -f "$cfgtmp" + else + mv "$cfgtmp" "$cfg" + fi + rm -f "$cfgorig" + echo "Processing $cfg complete" +} + function process_configs() { # assume we are in $source_tree/configs, need to get to top level pushd "$(switch_to_toplevel)" &>/dev/null + # The next line is throwaway code for transition to parallel + # processing. Leaving this line in place is harmless, but it can be + # removed the next time anyone updates this function. + [ -f .mismatches ] && rm -f .mismatches + + count=0 for cfg in "$SCRIPT_DIR/${PACKAGE_NAME}${KVERREL}${SUBARCH}"*.config do - arch=$(head -1 "$cfg" | cut -b 3-) - cfgtmp="${cfg}.tmp" - cfgorig="${cfg}.orig" - cat "$cfg" > "$cfgorig" - - if [ "$arch" = "EMPTY" ] - then - # This arch is intentionally left blank - continue + if [ "$count" -eq 0 ]; then + # do the first one by itself so that tools are built + process_config "$cfg" "$count" fi - echo -n "Processing $cfg ... " - - make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" listnewconfig >& .listnewconfig - grep -E 'CONFIG_' .listnewconfig > .newoptions - if test -n "$NEWOPTIONS" && test -s .newoptions - then - echo "Found unset config items, please set them to an appropriate value" - cat .newoptions - rm .newoptions - RETURNCODE=1 - [ "$CONTINUEONERROR" ] || exit 1 - fi - rm .newoptions - - grep -E 'config.*warning' .listnewconfig > .warnings - if test -n "$CHECKWARNINGS" && test -s .warnings - then - echo "Found misconfigured config items, please set them to an appropriate value" - cat .warnings - rm .warnings - RETURNCODE=1 - [ "$CONTINUEONERROR" ] || exit 1 - fi - rm .warnings - - rm .listnewconfig - - make ${MAKEOPTS} ARCH="$arch" CROSS_COMPILE=$(get_cross_compile $arch) KCONFIG_CONFIG="$cfgorig" olddefconfig > /dev/null || exit 1 - echo "# $arch" > "$cfgtmp" - cat "$cfgorig" >> "$cfgtmp" - if test -n "$CHECKOPTIONS" - then - checkoptions "$cfg" "$cfgtmp" - fi - # if test run, don't overwrite original - if test -n "$TESTRUN" - then - rm -f "$cfgtmp" - else - mv "$cfgtmp" "$cfg" - fi - rm -f "$cfgorig" - echo "done" + process_config "$cfg" "$count" & + waitpids[${count}]=$! + ((count++)) + while [ "$(jobs | grep Running | wc -l)" -ge $RHJOBS ]; do :; done done + for pid in ${waitpids[*]}; do + wait ${pid} + done + rm "$SCRIPT_DIR"/*.config*.old + + if ls .errors* 1> /dev/null 2>&1; then + RETURNCODE=1 + cat .errors* + rm .errors* -f + fi + if ls .mismatches* 1> /dev/null 2>&1; then + RETURNCODE=1 + cat .mismatches* + rm .mismatches* -f + fi + popd > /dev/null - echo "Processed config files are in $SCRIPT_DIR" + [ $RETURNCODE -eq 0 ] && echo "Processed config files are in $SCRIPT_DIR" } CHECKOPTIONS="" -CONTINUEONERROR="" NEWOPTIONS="" TESTRUN="" CHECKWARNINGS="" @@ -301,7 +347,6 @@ do case $key in -a) CHECKOPTIONS="x" - CONTINUEONERROR="x" NEWOPTIONS="x" CHECKWARNINGS="x" ;; @@ -311,9 +356,6 @@ do -h) usage ;; - -i) - CONTINUEONERROR="x" - ;; -n) NEWOPTIONS="x" ;; @@ -343,6 +385,7 @@ PACKAGE_NAME="${1:-kernel}" # defines the package name used KVERREL="$(test -n "$2" && echo "-$2" || echo "")" SUBARCH="$(test -n "$3" && echo "-$3" || echo "")" FLAVOR="$(test -n "$4" && echo "-$4" || echo "-common")" +RHJOBS="$(test -n "$5" && echo "$5" || nproc --all)" SCRIPT=$(readlink -f "$0") SCRIPT_DIR=$(dirname "$SCRIPT") diff --git a/sources b/sources index f0f0c1bdb..298c3db3a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-77.el9.tar.xz) = e591ccf35a4acf94529aef28821d7da9425883006dbcb5417b24fed77217e7e7663a16680c139581fc3592c45495e569d5e5a1d686bee3756995a3ddc1058ae9 -SHA512 (kernel-abi-stablelists-5.14.0-77.el9.tar.bz2) = 530626b5b61bb340b5fa4f75f0b0e21073770e9e3fde87b410701861565049b4341884048b0e83af3560879d3d446a96409a23263f3020f97b64eb8970b2dd93 -SHA512 (kernel-kabi-dw-5.14.0-77.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 +SHA512 (linux-5.14.0-78.el9.tar.xz) = bcaeed676bf79d24c158c133b097d938253409c13ce8c901dcb954adbb633be8e17e2e9b7949f7e628c139889a59d021381943f43aa1b78a63d77ad9bb8da6c5 +SHA512 (kernel-abi-stablelists-5.14.0-78.el9.tar.bz2) = 1f6c5942a1f6bdaccc6f1bdd3175656b95a21c9fc0b79111e9b5d3e3fb0ff9afe2eaff7b3914a2c618c67c86c6efa8e7929b8902c2bae4d8ef6c7eca523e85d2 +SHA512 (kernel-kabi-dw-5.14.0-78.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674