From d728804b2e53aba7d1e3d84928aae601f36a3576 Mon Sep 17 00:00:00 2001 From: almalinux-bot-kernel Date: Fri, 27 Mar 2026 04:49:28 +0000 Subject: [PATCH] Import of kernel-5.14.0-611.42.1.el9_7 --- ...5.14.0-611.41.1.el9 => COPYING-5.14.0-611.42.1.el9 | 0 Makefile.rhelver | 2 +- drivers/hid/intel-thc-hid/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/mld/Makefile | 2 +- drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile | 2 +- drivers/scsi/qla2xxx/qla_gs.c | 3 --- drivers/scsi/qla2xxx/qla_init.c | 9 --------- fs/xfs/libxfs/xfs_ialloc.c | 11 ++++++----- mm/debug_vm_pgtable.c | 9 +++++++-- redhat/kernel.changelog-9.7 | 7 +++++++ 10 files changed, 24 insertions(+), 23 deletions(-) rename COPYING-5.14.0-611.41.1.el9 => COPYING-5.14.0-611.42.1.el9 (100%) diff --git a/COPYING-5.14.0-611.41.1.el9 b/COPYING-5.14.0-611.42.1.el9 similarity index 100% rename from COPYING-5.14.0-611.41.1.el9 rename to COPYING-5.14.0-611.42.1.el9 diff --git a/Makefile.rhelver b/Makefile.rhelver index e2cef67c46..b86cca9b68 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 7 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 611.41.1 +RHEL_RELEASE = 611.42.1 # # ZSTREAM diff --git a/drivers/hid/intel-thc-hid/Makefile b/drivers/hid/intel-thc-hid/Makefile index 6f762d87af..ec427c23dd 100644 --- a/drivers/hid/intel-thc-hid/Makefile +++ b/drivers/hid/intel-thc-hid/Makefile @@ -19,4 +19,4 @@ intel-quicki2c-objs += intel-quicki2c/pci-quicki2c.o intel-quicki2c-objs += intel-quicki2c/quicki2c-hid.o intel-quicki2c-objs += intel-quicki2c/quicki2c-protocol.o -ccflags-y += -I $(src)/intel-thc +ccflags-y += -I $(srctree)/$(src)/intel-thc diff --git a/drivers/net/wireless/intel/iwlwifi/mld/Makefile b/drivers/net/wireless/intel/iwlwifi/mld/Makefile index ece66e7a9b..1cb47b3e06 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/mld/Makefile @@ -13,4 +13,4 @@ iwlmld-$(CONFIG_PM_SLEEP) += d3.o iwlmld-$(CONFIG_IWL_VENDOR_CMDS) += vendor-cmd.o iwlmld-$(CONFIG_IWLMVM_AX_SOFTAP_TESTMODE) += ax-softap-testmode.o -subdir-ccflags-y += -I$(src)/../ +subdir-ccflags-y += -I$(srctree)/$(src)/../ diff --git a/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile b/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile index 36317feb92..e878ec3b69 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile +++ b/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause iwlmld-tests-y += module.o hcmd.o utils.o link.o rx.o agg.o link-selection.o -ccflags-y += -I$(src)/../ +ccflags-y += -I$(srctree)/$(src)/../ obj-$(CONFIG_IWLWIFI_KUNIT_TESTS) += iwlmld-tests.o diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index d2bddca704..b500cda84f 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3356,9 +3356,6 @@ login_logout: atomic_read(&fcport->state) == FCS_ONLINE) || do_delete) { if (fcport->loop_id != FC_NO_LOOP_ID) { - if (fcport->flags & FCF_FCP2_DEVICE) - continue; - ql_log(ql_log_warn, vha, 0x20f0, "%s %d %8phC post del sess\n", __func__, __LINE__, diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 9201e499d9..8d53f6db14 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -1859,15 +1859,6 @@ void qla2x00_handle_rscn(scsi_qla_host_t *vha, struct event_arg *ea) case RSCN_PORT_ADDR: fcport = qla2x00_find_fcport_by_nportid(vha, &ea->id, 1); if (fcport) { - if (ql2xfc2target && - fcport->flags & FCF_FCP2_DEVICE && - atomic_read(&fcport->state) == FCS_ONLINE) { - ql_dbg(ql_dbg_disc, vha, 0x2115, - "Delaying session delete for FCP2 portid=%06x %8phC ", - fcport->d_id.b24, fcport->port_name); - return; - } - if (vha->hw->flags.edif_enabled && DBELL_ACTIVE(vha)) { /* * On ipsec start by remote port, Target port diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index c347c7ee8c..aafcb3d2ea 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -850,15 +850,16 @@ sparse_alloc: * invalid inode records, such as records that start at agbno 0 * or extend beyond the AG. * - * Set min agbno to the first aligned, non-zero agbno and max to - * the last aligned agbno that is at least one full chunk from - * the end of the AG. + * Set min agbno to the first chunk aligned, non-zero agbno and + * max to one less than the last chunk aligned agbno from the + * end of the AG. We subtract 1 from max so that the cluster + * allocation alignment takes over and allows allocation within + * the last full inode chunk in the AG. */ args.min_agbno = args.mp->m_sb.sb_inoalignmt; args.max_agbno = round_down(xfs_ag_block_count(args.mp, pag->pag_agno), - args.mp->m_sb.sb_inoalignmt) - - igeo->ialloc_blks; + args.mp->m_sb.sb_inoalignmt) - 1; error = xfs_alloc_vextent_near_bno(&args, XFS_AGB_TO_FSB(args.mp, pag->pag_agno, diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c index 06daf1d503..bcd53dbaee 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -1047,29 +1047,34 @@ static void __init destroy_args(struct pgtable_debug_args *args) /* Free page table entries */ if (args->start_ptep) { + pmd_clear(args->pmdp); pte_free(args->mm, args->start_ptep); mm_dec_nr_ptes(args->mm); } if (args->start_pmdp) { + pud_clear(args->pudp); pmd_free(args->mm, args->start_pmdp); mm_dec_nr_pmds(args->mm); } if (args->start_pudp) { + p4d_clear(args->p4dp); pud_free(args->mm, args->start_pudp); mm_dec_nr_puds(args->mm); } - if (args->start_p4dp) + if (args->start_p4dp) { + pgd_clear(args->pgdp); p4d_free(args->mm, args->start_p4dp); + } /* Free vma and mm struct */ if (args->vma) vm_area_free(args->vma); if (args->mm) - mmdrop(args->mm); + mmput(args->mm); } static struct page * __init diff --git a/redhat/kernel.changelog-9.7 b/redhat/kernel.changelog-9.7 index 8a2a8b4202..e6849ebc42 100644 --- a/redhat/kernel.changelog-9.7 +++ b/redhat/kernel.changelog-9.7 @@ -1,3 +1,10 @@ +* Thu Mar 12 2026 CKI KWF Bot [5.14.0-611.42.1.el9_7] +- scsi: qla2xxx: Allow recovery for tape devices (Ewan D. Milne) [RHEL-153437] +- xfs: set max_agbno to allow sparse alloc of last full inode chunk (Brian Foster) [RHEL-142600] +- mm/debug_vm_pgtable: clear page table entries at destroy_args() (Herton R. Krzesinski) [RHEL-128734] +- kbuild: use $(srctree)/$(src) for some Makefiles to fix the buildcheck test (Herton R. Krzesinski) [RHEL-106032] +Resolves: RHEL-106032, RHEL-128734, RHEL-142600, RHEL-153437 + * Sat Mar 07 2026 CKI KWF Bot [5.14.0-611.41.1.el9_7] - net: vxlan: prevent NULL deref in vxlan_xmit_one (Antoine Tenart) [RHEL-133369] - ACPI: PRM: Reduce unnecessary printing to avoid user confusion (Mark Langsdorf) [RHEL-123057]