From 431c74742735ee5bccaca333fd0c55056a4b2d6d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 24 Jul 2023 08:20:21 +0200 Subject: [PATCH] fuzz cleanups --- ...l-up-loops-in-dsp-setup-code-for-aud.patch | 11 +- ...nteger-overflow-in-radeon_cs_parser_.patch | 9 +- .../ethernet-use-of_get_ethdev_address.patch | 205 ++++++------------ ...-read-only-mounted-filesystem-in-txb.patch | 9 +- ...s-fix-null-ptr-deref-read-in-txbegin.patch | 9 +- ...-array-index-out-of-bounds-in-dballo.patch | 9 +- ...c-prom-address-warray-bounds-warning.patch | 9 +- queue-5.15/quota-fix-warning-in-dqgrab.patch | 9 +- ...isable-quotas-when-add_dquot_ref-fai.patch | 11 +- queue-5.15/series | 1 + ...lized-array-access-for-some-pathname.patch | 9 +- ...acklight-native-dmi-quirk-for-dell-s.patch | 21 +- ...l-up-loops-in-dsp-setup-code-for-aud.patch | 11 +- ...nteger-overflow-in-radeon_cs_parser_.patch | 9 +- ...-read-only-mounted-filesystem-in-txb.patch | 9 +- ...s-fix-null-ptr-deref-read-in-txbegin.patch | 9 +- ...-array-index-out-of-bounds-in-dballo.patch | 9 +- ...r-03f0-464a-hp-elite-presenter-mouse.patch | 15 +- ...c-prom-address-warray-bounds-warning.patch | 9 +- ...nd-offset-of-struct-vfsmount-in-ovl_.patch | 13 +- queue-6.1/quota-fix-warning-in-dqgrab.patch | 9 +- ...isable-quotas-when-add_dquot_ref-fai.patch | 9 +- queue-6.1/series | 1 + ...l-up-loops-in-dsp-setup-code-for-aud.patch | 11 +- ...-add-quirks-for-rog-ally-cs35l41-aud.patch | 13 +- ...-fix-generic-fixup-definition-for-cs.patch | 15 +- ...nteger-overflow-in-radeon_cs_parser_.patch | 9 +- ...s-fix-null-ptr-deref-read-in-txbegin.patch | 9 +- ...-array-index-out-of-bounds-in-dballo.patch | 9 +- ...r-03f0-464a-hp-elite-presenter-mouse.patch | 15 +- ...nd-offset-of-struct-vfsmount-in-ovl_.patch | 13 +- queue-6.4/quota-fix-warning-in-dqgrab.patch | 9 +- ...isable-quotas-when-add_dquot_ref-fai.patch | 9 +- queue-6.4/series | 1 + 34 files changed, 153 insertions(+), 375 deletions(-) diff --git a/queue-5.15/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch b/queue-5.15/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch index 2aa553ed58a..7369250645b 100644 --- a/queue-5.15/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch +++ b/queue-5.15/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20230510173917.3073107-3-oswald.buddenhagen@gmx. Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/emu10k1/emufx.c | 112 +++----------------------------------- + sound/pci/emu10k1/emufx.c | 112 +++------------------------------------------- 1 file changed, 9 insertions(+), 103 deletions(-) -diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c -index 5c00e35367675..dc4b30d1b7168 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c -@@ -1557,14 +1557,8 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) +@@ -1563,14 +1563,8 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_G gpr += 2; /* Master volume (will be renamed later) */ @@ -40,7 +38,7 @@ index 5c00e35367675..dc4b30d1b7168 100644 snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0); gpr += 2; -@@ -1648,102 +1642,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) +@@ -1654,102 +1648,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_G dev_dbg(emu->card->dev, "emufx.c: gpr=0x%x, tmp=0x%x\n", gpr, tmp); */ @@ -150,6 +148,3 @@ index 5c00e35367675..dc4b30d1b7168 100644 } #if 0 --- -2.39.2 - diff --git a/queue-5.15/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch b/queue-5.15/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch index 433cc7d0acb..d11ea5e3f19 100644 --- a/queue-5.15/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch +++ b/queue-5.15/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch @@ -21,14 +21,12 @@ Signed-off-by: hackyzh002 Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- - drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c -index 1ae31dbc61c64..5e61abb3dce5c 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c -@@ -265,7 +265,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) +@@ -270,7 +270,8 @@ int radeon_cs_parser_init(struct radeon_ { struct drm_radeon_cs *cs = data; uint64_t *chunk_array_ptr; @@ -38,6 +36,3 @@ index 1ae31dbc61c64..5e61abb3dce5c 100644 u32 ring = RADEON_CS_RING_GFX; s32 priority = 0; --- -2.39.2 - diff --git a/queue-5.15/ethernet-use-of_get_ethdev_address.patch b/queue-5.15/ethernet-use-of_get_ethdev_address.patch index 49998acc84d..0c62daf3eb2 100644 --- a/queue-5.15/ethernet-use-of_get_ethdev_address.patch +++ b/queue-5.15/ethernet-use-of_get_ethdev_address.patch @@ -21,47 +21,45 @@ Signed-off-by: David S. Miller Stable-dep-of: 1d6d537dc55d ("net: ethernet: mtk_eth_soc: handle probe deferral") Signed-off-by: Sasha Levin --- - drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- - drivers/net/ethernet/altera/altera_tse_main.c | 2 +- - drivers/net/ethernet/arc/emac_main.c | 2 +- - drivers/net/ethernet/atheros/ag71xx.c | 2 +- - drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +- - drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- - drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- - drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- - drivers/net/ethernet/cadence/macb_main.c | 2 +- - drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- - drivers/net/ethernet/ethoc.c | 2 +- - drivers/net/ethernet/ezchip/nps_enet.c | 2 +- - drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- - drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- - drivers/net/ethernet/freescale/gianfar.c | 2 +- - drivers/net/ethernet/freescale/ucc_geth.c | 2 +- - drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- - drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- - drivers/net/ethernet/korina.c | 2 +- - drivers/net/ethernet/lantiq_xrx200.c | 2 +- - drivers/net/ethernet/litex/litex_liteeth.c | 2 +- - drivers/net/ethernet/marvell/mvneta.c | 2 +- - drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- - drivers/net/ethernet/marvell/sky2.c | 2 +- - drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- - drivers/net/ethernet/micrel/ks8851_common.c | 2 +- - drivers/net/ethernet/nxp/lpc_eth.c | 2 +- - drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- - drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- - drivers/net/ethernet/renesas/ravb_main.c | 2 +- - drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- - drivers/net/ethernet/socionext/sni_ave.c | 2 +- - drivers/net/ethernet/ti/netcp_core.c | 2 +- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 2 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/ethoc.c | 2 +- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- + drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 2 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/lantiq_xrx200.c | 2 +- + drivers/net/ethernet/litex/litex_liteeth.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/nxp/lpc_eth.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 2 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 +- + drivers/net/ethernet/socionext/sni_ave.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) -diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c -index 037baea1c7388..ef218a6d477cc 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c -@@ -852,7 +852,7 @@ static int emac_probe(struct platform_device *pdev) +@@ -852,7 +852,7 @@ static int emac_probe(struct platform_de } /* Read MAC-address from DT */ @@ -70,11 +68,9 @@ index 037baea1c7388..ef218a6d477cc 100644 if (ret) { /* if the MAC address is invalid get a random one */ eth_hw_addr_random(ndev); -diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c -index b51f5b9577e0a..9e721436f06fa 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c -@@ -1531,7 +1531,7 @@ static int altera_tse_probe(struct platform_device *pdev) +@@ -1531,7 +1531,7 @@ static int altera_tse_probe(struct platf priv->rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE; /* get default MAC address from device tree */ @@ -83,11 +79,9 @@ index b51f5b9577e0a..9e721436f06fa 100644 if (ret) eth_hw_addr_random(ndev); -diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c -index 38c288ec90590..333333692caa5 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c -@@ -941,7 +941,7 @@ int arc_emac_probe(struct net_device *ndev, int interface) +@@ -941,7 +941,7 @@ int arc_emac_probe(struct net_device *nd } /* Get MAC address from device tree */ @@ -96,11 +90,9 @@ index 38c288ec90590..333333692caa5 100644 if (err) eth_hw_addr_random(ndev); -diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c -index 7295244b78d07..9d8b214c129d2 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c -@@ -1964,7 +1964,7 @@ static int ag71xx_probe(struct platform_device *pdev) +@@ -1964,7 +1964,7 @@ static int ag71xx_probe(struct platform_ ag->stop_desc->ctrl = 0; ag->stop_desc->next = (u32)ag->stop_desc_dma; @@ -109,11 +101,9 @@ index 7295244b78d07..9d8b214c129d2 100644 if (err) { netif_err(ag, probe, ndev, "invalid MAC address, using random address\n"); eth_random_addr(ndev->dev_addr); -diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c -index 7e89664943ceb..ba48ddff5e7cd 100644 --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c -@@ -719,7 +719,7 @@ static int bcm4908_enet_probe(struct platform_device *pdev) +@@ -719,7 +719,7 @@ static int bcm4908_enet_probe(struct pla return err; SET_NETDEV_DEV(netdev, &pdev->dev); @@ -122,11 +112,9 @@ index 7e89664943ceb..ba48ddff5e7cd 100644 if (err) eth_hw_addr_random(netdev); netdev->netdev_ops = &bcm4908_enet_netdev_ops; -diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c -index 4c7f828c69c6b..25466d73b432a 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c -@@ -2561,7 +2561,7 @@ static int bcm_sysport_probe(struct platform_device *pdev) +@@ -2561,7 +2561,7 @@ static int bcm_sysport_probe(struct plat } /* Initialize netdevice members */ @@ -135,11 +123,9 @@ index 4c7f828c69c6b..25466d73b432a 100644 if (ret) { dev_warn(&pdev->dev, "using random Ethernet MAC\n"); eth_hw_addr_random(dev); -diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c -index bdb1b8053b69f..678cc6a3617c3 100644 --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c -@@ -128,7 +128,7 @@ static int bgmac_probe(struct bcma_device *core) +@@ -128,7 +128,7 @@ static int bgmac_probe(struct bcma_devic bcma_set_drvdata(core, bgmac); @@ -148,11 +134,9 @@ index bdb1b8053b69f..678cc6a3617c3 100644 if (err == -EPROBE_DEFER) return err; -diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c -index 94eb3a42158e9..b4381cd419792 100644 --- a/drivers/net/ethernet/broadcom/bgmac-platform.c +++ b/drivers/net/ethernet/broadcom/bgmac-platform.c -@@ -192,7 +192,7 @@ static int bgmac_probe(struct platform_device *pdev) +@@ -192,7 +192,7 @@ static int bgmac_probe(struct platform_d bgmac->dev = &pdev->dev; bgmac->dma_dev = &pdev->dev; @@ -161,11 +145,9 @@ index 94eb3a42158e9..b4381cd419792 100644 if (ret == -EPROBE_DEFER) return ret; -diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c -index ddadb1822d897..dac56169851a2 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c -@@ -4835,7 +4835,7 @@ static int macb_probe(struct platform_device *pdev) +@@ -4835,7 +4835,7 @@ static int macb_probe(struct platform_de if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) bp->rx_intr_mask |= MACB_BIT(RXUBR); @@ -174,11 +156,9 @@ index ddadb1822d897..dac56169851a2 100644 if (err == -EPROBE_DEFER) goto err_out_free_netdev; else if (err) -diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c -index 30463a6d1f8c9..4e39d712e121e 100644 --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c -@@ -1501,7 +1501,7 @@ static int octeon_mgmt_probe(struct platform_device *pdev) +@@ -1501,7 +1501,7 @@ static int octeon_mgmt_probe(struct plat netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM; netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN; @@ -187,11 +167,9 @@ index 30463a6d1f8c9..4e39d712e121e 100644 if (result) eth_hw_addr_random(netdev); -diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c -index e63aef6a9e33a..7f456297fc458 100644 --- a/drivers/net/ethernet/ethoc.c +++ b/drivers/net/ethernet/ethoc.c -@@ -1151,7 +1151,7 @@ static int ethoc_probe(struct platform_device *pdev) +@@ -1151,7 +1151,7 @@ static int ethoc_probe(struct platform_d eth_hw_addr_set(netdev, pdata->hwaddr); priv->phy_id = pdata->phy_id; } else { @@ -200,11 +178,9 @@ index e63aef6a9e33a..7f456297fc458 100644 priv->phy_id = -1; } -diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c -index f5935eb5a791c..323340826dabd 100644 --- a/drivers/net/ethernet/ezchip/nps_enet.c +++ b/drivers/net/ethernet/ezchip/nps_enet.c -@@ -601,7 +601,7 @@ static s32 nps_enet_probe(struct platform_device *pdev) +@@ -601,7 +601,7 @@ static s32 nps_enet_probe(struct platfor dev_dbg(dev, "Registers base address is 0x%p\n", priv->regs_base); /* set kernel MAC address to dev */ @@ -213,11 +189,9 @@ index f5935eb5a791c..323340826dabd 100644 if (err) eth_hw_addr_random(ndev); -diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c -index 73ff359a15f1a..2777dd2b4dd78 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c -@@ -890,7 +890,7 @@ static int mpc52xx_fec_probe(struct platform_device *op) +@@ -890,7 +890,7 @@ static int mpc52xx_fec_probe(struct plat * * First try to read MAC address from DT */ @@ -226,11 +200,9 @@ index 73ff359a15f1a..2777dd2b4dd78 100644 if (rv) { struct mpc52xx_fec __iomem *fec = priv->fec; -diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c -index 2db6e38a772e7..bacf25318f87a 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c -@@ -1005,7 +1005,7 @@ static int fs_enet_probe(struct platform_device *ofdev) +@@ -1005,7 +1005,7 @@ static int fs_enet_probe(struct platform spin_lock_init(&fep->lock); spin_lock_init(&fep->tx_lock); @@ -239,11 +211,9 @@ index 2db6e38a772e7..bacf25318f87a 100644 ret = fep->ops->allocate_bd(ndev); if (ret) -diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c -index af6ad94bf24a4..acab58fd3db38 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -753,7 +753,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) +@@ -753,7 +753,7 @@ static int gfar_of_init(struct platform_ if (stash_len || stash_idx) priv->device_flags |= FSL_GIANFAR_DEV_HAS_BUF_STASHING; @@ -252,11 +222,9 @@ index af6ad94bf24a4..acab58fd3db38 100644 if (err) { eth_hw_addr_random(dev); dev_info(&ofdev->dev, "Using random MAC address: %pM\n", dev->dev_addr); -diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c -index 3eb288d10b0c3..e0036fd2b56c7 100644 --- a/drivers/net/ethernet/freescale/ucc_geth.c +++ b/drivers/net/ethernet/freescale/ucc_geth.c -@@ -3731,7 +3731,7 @@ static int ucc_geth_probe(struct platform_device* ofdev) +@@ -3731,7 +3731,7 @@ static int ucc_geth_probe(struct platfor goto err_free_netdev; } @@ -265,11 +233,9 @@ index 3eb288d10b0c3..e0036fd2b56c7 100644 ugeth->ug_info = ug_info; ugeth->dev = device; -diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c -index ea3e67cf5ffa1..05cb4582a58d5 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c -@@ -841,7 +841,7 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) +@@ -841,7 +841,7 @@ static int hisi_femac_drv_probe(struct p (unsigned long)phy->phy_id, phy_modes(phy->interface)); @@ -278,11 +244,9 @@ index ea3e67cf5ffa1..05cb4582a58d5 100644 if (ret) { eth_hw_addr_random(ndev); dev_warn(dev, "using random MAC address %pM\n", -diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c -index 0a70fb979f0c3..923191b9a87d4 100644 --- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c -@@ -1219,7 +1219,7 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) +@@ -1219,7 +1219,7 @@ static int hix5hd2_dev_probe(struct plat goto out_phy_node; } @@ -291,11 +255,9 @@ index 0a70fb979f0c3..923191b9a87d4 100644 if (ret) { eth_hw_addr_random(ndev); netdev_warn(ndev, "using random MAC address %pM\n", -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index 097516af43256..df9a8eefa007a 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c -@@ -1298,7 +1298,7 @@ static int korina_probe(struct platform_device *pdev) +@@ -1298,7 +1298,7 @@ static int korina_probe(struct platform_ if (mac_addr) eth_hw_addr_set(dev, mac_addr); @@ -304,11 +266,9 @@ index 097516af43256..df9a8eefa007a 100644 eth_hw_addr_random(dev); clk = devm_clk_get_optional(&pdev->dev, "mdioclk"); -diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c -index b02f796b5422f..fa0ef1852fb76 100644 --- a/drivers/net/ethernet/lantiq_xrx200.c +++ b/drivers/net/ethernet/lantiq_xrx200.c -@@ -474,7 +474,7 @@ static int xrx200_probe(struct platform_device *pdev) +@@ -474,7 +474,7 @@ static int xrx200_probe(struct platform_ return PTR_ERR(priv->clk); } @@ -317,11 +277,9 @@ index b02f796b5422f..fa0ef1852fb76 100644 if (err) eth_hw_addr_random(net_dev); -diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c -index 7b39b910e4a14..3abcc02fe0e45 100644 --- a/drivers/net/ethernet/litex/litex_liteeth.c +++ b/drivers/net/ethernet/litex/litex_liteeth.c -@@ -277,7 +277,7 @@ static int liteeth_probe(struct platform_device *pdev) +@@ -266,7 +266,7 @@ static int liteeth_probe(struct platform priv->tx_base = buf_base + priv->num_rx_slots * priv->slot_size; priv->tx_slot = 0; @@ -330,11 +288,9 @@ index 7b39b910e4a14..3abcc02fe0e45 100644 if (err) eth_hw_addr_random(netdev); -diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c -index f5b5ae58c2691..5fa81322a44be 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -5242,7 +5242,7 @@ static int mvneta_probe(struct platform_device *pdev) +@@ -5242,7 +5242,7 @@ static int mvneta_probe(struct platform_ goto err_free_ports; } @@ -343,11 +299,9 @@ index f5b5ae58c2691..5fa81322a44be 100644 if (!err) { mac_from = "device tree"; } else { -diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c -index fab53c9b8380c..8ebd13f089db2 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c -@@ -1434,7 +1434,7 @@ static int pxa168_eth_probe(struct platform_device *pdev) +@@ -1434,7 +1434,7 @@ static int pxa168_eth_probe(struct platf INIT_WORK(&pep->tx_timeout_task, pxa168_eth_tx_timeout_task); @@ -356,11 +310,9 @@ index fab53c9b8380c..8ebd13f089db2 100644 if (err) { /* try reading the mac address, if set by the bootloader */ pxa168_eth_get_mac_address(dev, dev->dev_addr); -diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c -index e9fc74e54b22e..ac0dbf1b97437 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c -@@ -4802,7 +4802,7 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port, +@@ -4802,7 +4802,7 @@ static struct net_device *sky2_init_netd * 1) from device tree data * 2) from internal registers set by bootloader */ @@ -369,11 +321,9 @@ index e9fc74e54b22e..ac0dbf1b97437 100644 if (ret) memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN); -diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -index bb1acdb0c62b3..c55ba1d085e5b 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2618,7 +2618,7 @@ static int __init mtk_init(struct net_device *dev) +@@ -2618,7 +2618,7 @@ static int __init mtk_init(struct net_de struct mtk_eth *eth = mac->hw; int ret; @@ -382,11 +332,9 @@ index bb1acdb0c62b3..c55ba1d085e5b 100644 if (ret) { /* If the mac address is invalid, use random mac address */ eth_hw_addr_random(dev); -diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c -index a6db1a8156e1a..2c80dba2606cd 100644 --- a/drivers/net/ethernet/micrel/ks8851_common.c +++ b/drivers/net/ethernet/micrel/ks8851_common.c -@@ -195,7 +195,7 @@ static void ks8851_init_mac(struct ks8851_net *ks, struct device_node *np) +@@ -195,7 +195,7 @@ static void ks8851_init_mac(struct ks885 struct net_device *dev = ks->netdev; int ret; @@ -395,11 +343,9 @@ index a6db1a8156e1a..2c80dba2606cd 100644 if (!ret) { ks8851_write_mac_addr(dev); return; -diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c -index 919140522885d..b42b65fb034ed 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c -@@ -1349,7 +1349,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) +@@ -1349,7 +1349,7 @@ static int lpc_eth_drv_probe(struct plat __lpc_get_mac(pldat, ndev->dev_addr); if (!is_valid_ether_addr(ndev->dev_addr)) { @@ -408,8 +354,6 @@ index 919140522885d..b42b65fb034ed 100644 } if (!is_valid_ether_addr(ndev->dev_addr)) eth_hw_addr_random(ndev); -diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c -index 2205bb437e680..a047bab1d7c7e 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -967,7 +967,7 @@ qca_spi_probe(struct spi_device *spi) @@ -421,11 +365,9 @@ index 2205bb437e680..a047bab1d7c7e 100644 if (ret) { eth_hw_addr_random(qca->net_dev); dev_info(&spi->dev, "Using random MAC address: %pM\n", -diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c -index ce3f7ce31adc1..27c4f43176aaa 100644 --- a/drivers/net/ethernet/qualcomm/qca_uart.c +++ b/drivers/net/ethernet/qualcomm/qca_uart.c -@@ -347,7 +347,7 @@ static int qca_uart_probe(struct serdev_device *serdev) +@@ -347,7 +347,7 @@ static int qca_uart_probe(struct serdev_ of_property_read_u32(serdev->dev.of_node, "current-speed", &speed); @@ -434,11 +376,9 @@ index ce3f7ce31adc1..27c4f43176aaa 100644 if (ret) { eth_hw_addr_random(qca->net_dev); dev_info(&serdev->dev, "Using random MAC address: %pM\n", -diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c -index 12548eeef4f8a..4ee72d33e9cb7 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c -@@ -114,7 +114,7 @@ static void ravb_read_mac_address(struct device_node *np, +@@ -114,7 +114,7 @@ static void ravb_read_mac_address(struct { int ret; @@ -447,11 +387,9 @@ index 12548eeef4f8a..4ee72d33e9cb7 100644 if (ret) { u32 mahr = ravb_read(ndev, MAHR); u32 malr = ravb_read(ndev, MALR); -diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c -index 4639ed9438a3f..9265324666911 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c -@@ -118,7 +118,7 @@ static int sxgbe_platform_probe(struct platform_device *pdev) +@@ -118,7 +118,7 @@ static int sxgbe_platform_probe(struct p } /* Get MAC address if available (DT) */ @@ -460,11 +398,9 @@ index 4639ed9438a3f..9265324666911 100644 /* Get the TX/RX IRQ numbers */ for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) { -diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c -index 57dc9680ad50a..8ff56e2c87746 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c -@@ -1601,7 +1601,7 @@ static int ave_probe(struct platform_device *pdev) +@@ -1601,7 +1601,7 @@ static int ave_probe(struct platform_dev ndev->max_mtu = AVE_MAX_ETHFRAME - (ETH_HLEN + ETH_FCS_LEN); @@ -473,11 +409,9 @@ index 57dc9680ad50a..8ff56e2c87746 100644 if (ret) { /* if the mac address is invalid, use random mac address */ eth_hw_addr_random(ndev); -diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c -index 0cd47348890db..a6450055908db 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c -@@ -2035,7 +2035,7 @@ static int netcp_create_interface(struct netcp_device *netcp_device, +@@ -2035,7 +2035,7 @@ static int netcp_create_interface(struct devm_iounmap(dev, efuse); devm_release_mem_region(dev, res.start, size); } else { @@ -486,11 +420,9 @@ index 0cd47348890db..a6450055908db 100644 if (ret) eth_random_addr(ndev->dev_addr); } -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index b1971c4d5313e..093c75da38c47 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1151,7 +1151,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev) +@@ -1151,7 +1151,7 @@ static int xemaclite_of_probe(struct pla lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong"); lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong"); @@ -499,6 +431,3 @@ index b1971c4d5313e..093c75da38c47 100644 if (rc) { dev_warn(dev, "No MAC address found, using random\n"); eth_hw_addr_random(ndev); --- -2.39.2 - diff --git a/queue-5.15/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch b/queue-5.15/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch index 29087f9182d..9596b5e5d8f 100644 --- a/queue-5.15/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch +++ b/queue-5.15/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch @@ -17,14 +17,12 @@ Signed-off-by: Immad Mir Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/jfs_txnmgr.c | 5 +++++ + fs/jfs/jfs_txnmgr.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c -index 224ef034004b7..2cb460912468e 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c -@@ -367,6 +367,11 @@ tid_t txBegin(struct super_block *sb, int flag) +@@ -354,6 +354,11 @@ tid_t txBegin(struct super_block *sb, in jfs_info("txBegin: flag = 0x%x", flag); log = JFS_SBI(sb)->log; @@ -36,6 +34,3 @@ index 224ef034004b7..2cb460912468e 100644 TXN_LOCK(); INCREMENT(TxStat.txBegin); --- -2.39.2 - diff --git a/queue-5.15/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch b/queue-5.15/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch index 35a95c307b6..a17dbd964e1 100644 --- a/queue-5.15/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch +++ b/queue-5.15/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch @@ -21,14 +21,12 @@ Signed-off-by: Immad Mir Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/namei.c | 5 +++++ + fs/jfs/namei.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c -index 56c3fcbfe80ed..6726dcddd6f86 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c -@@ -813,6 +813,11 @@ static int jfs_link(struct dentry *old_dentry, +@@ -799,6 +799,11 @@ static int jfs_link(struct dentry *old_d if (rc) goto out; @@ -40,6 +38,3 @@ index 56c3fcbfe80ed..6726dcddd6f86 100644 tid = txBegin(ip->i_sb, 0); mutex_lock_nested(&JFS_IP(dir)->commit_mutex, COMMIT_MUTEX_PARENT); --- -2.39.2 - diff --git a/queue-5.15/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch b/queue-5.15/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch index 870b91b80bf..834786a6a75 100644 --- a/queue-5.15/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch +++ b/queue-5.15/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch @@ -66,14 +66,12 @@ Signed-off-by: Yogesh Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/jfs_dmap.c | 3 +++ + fs/jfs/jfs_dmap.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c -index 6a0f564e58ddb..c21d6566da096 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c -@@ -2034,6 +2034,9 @@ dbAllocDmapLev(struct bmap * bmp, +@@ -2027,6 +2027,9 @@ dbAllocDmapLev(struct bmap * bmp, if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx)) return -ENOSPC; @@ -83,6 +81,3 @@ index 6a0f564e58ddb..c21d6566da096 100644 /* determine the block number within the file system corresponding * to the leaf at which free space was found. */ --- -2.39.2 - diff --git a/queue-5.15/mips-dec-prom-address-warray-bounds-warning.patch b/queue-5.15/mips-dec-prom-address-warray-bounds-warning.patch index b8138a805fd..60b7fdc9d4d 100644 --- a/queue-5.15/mips-dec-prom-address-warray-bounds-warning.patch +++ b/queue-5.15/mips-dec-prom-address-warray-bounds-warning.patch @@ -35,14 +35,12 @@ Signed-off-by: Gustavo A. R. Silva Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- - arch/mips/include/asm/dec/prom.h | 2 +- + arch/mips/include/asm/dec/prom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/include/asm/dec/prom.h b/arch/mips/include/asm/dec/prom.h -index 09538ff5e9245..6f0405ba27d6d 100644 --- a/arch/mips/include/asm/dec/prom.h +++ b/arch/mips/include/asm/dec/prom.h -@@ -74,7 +74,7 @@ static inline bool prom_is_rex(u32 magic) +@@ -70,7 +70,7 @@ static inline bool prom_is_rex(u32 magic */ typedef struct { int pagesize; @@ -51,6 +49,3 @@ index 09538ff5e9245..6f0405ba27d6d 100644 } memmap; --- -2.39.2 - diff --git a/queue-5.15/quota-fix-warning-in-dqgrab.patch b/queue-5.15/quota-fix-warning-in-dqgrab.patch index bc0d0df4219..d7c504619b8 100644 --- a/queue-5.15/quota-fix-warning-in-dqgrab.patch +++ b/queue-5.15/quota-fix-warning-in-dqgrab.patch @@ -84,14 +84,12 @@ Signed-off-by: Jan Kara Message-Id: <20230605140731.2427629-3-yebin10@huawei.com> Signed-off-by: Sasha Levin --- - fs/quota/dquot.c | 2 +- + fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c -index 1cbec5dde5830..1629d50782bf9 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c -@@ -540,7 +540,7 @@ static void invalidate_dquots(struct super_block *sb, int type) +@@ -555,7 +555,7 @@ restart: continue; /* Wait for dquot users */ if (atomic_read(&dquot->dq_count)) { @@ -100,6 +98,3 @@ index 1cbec5dde5830..1629d50782bf9 100644 spin_unlock(&dq_list_lock); /* * Once dqput() wakes us up, we know it's time to free --- -2.39.2 - diff --git a/queue-5.15/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch b/queue-5.15/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch index 477eae0be2a..b8a2b547452 100644 --- a/queue-5.15/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch +++ b/queue-5.15/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch @@ -23,14 +23,12 @@ Signed-off-by: Jan Kara Message-Id: <20230605140731.2427629-2-yebin10@huawei.com> Signed-off-by: Sasha Levin --- - fs/quota/dquot.c | 3 ++- + fs/quota/dquot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c -index 7c364cda8daac..1cbec5dde5830 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c -@@ -2387,7 +2387,8 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, +@@ -2413,7 +2413,8 @@ int dquot_load_quota_sb(struct super_blo error = add_dquot_ref(sb, type); if (error) @@ -39,7 +37,4 @@ index 7c364cda8daac..1cbec5dde5830 100644 + DQUOT_USAGE_ENABLED | DQUOT_LIMITS_ENABLED); return error; - out_file_init: --- -2.39.2 - + out_fmt: diff --git a/queue-5.15/series b/queue-5.15/series index 20782ab7949..80a5759ddf2 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -76,3 +76,4 @@ tcp-annotate-data-races-around-tp-notsent_lowat.patch tcp-annotate-data-races-around-icsk-icsk_user_timeou.patch tcp-annotate-data-races-around-fastopenq.max_qlen.patch net-phy-prevent-stale-pointer-dereference-in-phy_ini.patch +jbd2-recheck-chechpointing-non-dirty-buffer.patch diff --git a/queue-5.15/udf-fix-uninitialized-array-access-for-some-pathname.patch b/queue-5.15/udf-fix-uninitialized-array-access-for-some-pathname.patch index 79313272372..3e220e6aa36 100644 --- a/queue-5.15/udf-fix-uninitialized-array-access-for-some-pathname.patch +++ b/queue-5.15/udf-fix-uninitialized-array-access-for-some-pathname.patch @@ -20,14 +20,12 @@ Link: https://lore.kernel.org/all/000000000000e2638a05fe9dc8f9@google.com Signed-off-by: Jan Kara Signed-off-by: Sasha Levin --- - fs/udf/unicode.c | 2 +- + fs/udf/unicode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c -index 61a1738895b7a..ad04dc2278339 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c -@@ -268,7 +268,7 @@ static int udf_name_from_CS0(uint8_t *str_o, int str_max_len, +@@ -247,7 +247,7 @@ static int udf_name_from_CS0(struct supe } if (translate) { @@ -36,6 +34,3 @@ index 61a1738895b7a..ad04dc2278339 100644 (str_o_len == 1 || str_o[1] == '.')) needsCRC = 1; if (needsCRC) { --- -2.39.2 - diff --git a/queue-6.1/acpi-video-add-backlight-native-dmi-quirk-for-dell-s.patch b/queue-6.1/acpi-video-add-backlight-native-dmi-quirk-for-dell-s.patch index 9ccde5f3384..b2ef9946ee4 100644 --- a/queue-6.1/acpi-video-add-backlight-native-dmi-quirk-for-dell-s.patch +++ b/queue-6.1/acpi-video-add-backlight-native-dmi-quirk-for-dell-s.patch @@ -19,28 +19,23 @@ Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- - drivers/acpi/video_detect.c | 8 ++++++++ + drivers/acpi/video_detect.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c -index 4a77e7e6e3fa0..c8dd7f7407da2 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c -@@ -526,6 +526,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"), - }, +@@ -512,6 +512,14 @@ static const struct dmi_system_id video_ }, -+ { -+ .callback = video_detect_force_native, + { + .callback = video_detect_force_native, + /* Dell Studio 1569 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1569"), + }, + }, - { - .callback = video_detect_force_native, ++ { ++ .callback = video_detect_force_native, /* Acer Aspire 3830TG */ --- -2.39.2 - + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), diff --git a/queue-6.1/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch b/queue-6.1/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch index 9aaf0c9504e..6ea2cf0afbf 100644 --- a/queue-6.1/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch +++ b/queue-6.1/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20230510173917.3073107-3-oswald.buddenhagen@gmx. Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/emu10k1/emufx.c | 112 +++----------------------------------- + sound/pci/emu10k1/emufx.c | 112 +++------------------------------------------- 1 file changed, 9 insertions(+), 103 deletions(-) -diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c -index 1f25e6d029d82..84d98c098b744 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c -@@ -1550,14 +1550,8 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) +@@ -1563,14 +1563,8 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_G gpr += 2; /* Master volume (will be renamed later) */ @@ -40,7 +38,7 @@ index 1f25e6d029d82..84d98c098b744 100644 snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0); gpr += 2; -@@ -1641,102 +1635,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) +@@ -1654,102 +1648,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_G dev_dbg(emu->card->dev, "emufx.c: gpr=0x%x, tmp=0x%x\n", gpr, tmp); */ @@ -150,6 +148,3 @@ index 1f25e6d029d82..84d98c098b744 100644 } #if 0 --- -2.39.2 - diff --git a/queue-6.1/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch b/queue-6.1/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch index 4c2b917abd6..0ff32277d59 100644 --- a/queue-6.1/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch +++ b/queue-6.1/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch @@ -21,14 +21,12 @@ Signed-off-by: hackyzh002 Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- - drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c -index 1ae31dbc61c64..5e61abb3dce5c 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c -@@ -265,7 +265,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) +@@ -270,7 +270,8 @@ int radeon_cs_parser_init(struct radeon_ { struct drm_radeon_cs *cs = data; uint64_t *chunk_array_ptr; @@ -38,6 +36,3 @@ index 1ae31dbc61c64..5e61abb3dce5c 100644 u32 ring = RADEON_CS_RING_GFX; s32 priority = 0; --- -2.39.2 - diff --git a/queue-6.1/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch b/queue-6.1/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch index 4331148e36a..15831506415 100644 --- a/queue-6.1/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch +++ b/queue-6.1/fs-jfs-check-for-read-only-mounted-filesystem-in-txb.patch @@ -17,14 +17,12 @@ Signed-off-by: Immad Mir Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/jfs_txnmgr.c | 5 +++++ + fs/jfs/jfs_txnmgr.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c -index 78789c5ed36b0..e10db01f253b8 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c -@@ -367,6 +367,11 @@ tid_t txBegin(struct super_block *sb, int flag) +@@ -354,6 +354,11 @@ tid_t txBegin(struct super_block *sb, in jfs_info("txBegin: flag = 0x%x", flag); log = JFS_SBI(sb)->log; @@ -36,6 +34,3 @@ index 78789c5ed36b0..e10db01f253b8 100644 TXN_LOCK(); INCREMENT(TxStat.txBegin); --- -2.39.2 - diff --git a/queue-6.1/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch b/queue-6.1/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch index bccceacdac9..e3aeaa1be9e 100644 --- a/queue-6.1/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch +++ b/queue-6.1/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch @@ -22,14 +22,12 @@ Signed-off-by: Immad Mir Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/namei.c | 5 +++++ + fs/jfs/namei.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c -index 14528c0ffe635..c2c439acbb780 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c -@@ -811,6 +811,11 @@ static int jfs_link(struct dentry *old_dentry, +@@ -799,6 +799,11 @@ static int jfs_link(struct dentry *old_d if (rc) goto out; @@ -41,6 +39,3 @@ index 14528c0ffe635..c2c439acbb780 100644 tid = txBegin(ip->i_sb, 0); mutex_lock_nested(&JFS_IP(dir)->commit_mutex, COMMIT_MUTEX_PARENT); --- -2.39.2 - diff --git a/queue-6.1/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch b/queue-6.1/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch index 0676bb0e0af..bc29fa87225 100644 --- a/queue-6.1/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch +++ b/queue-6.1/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch @@ -66,14 +66,12 @@ Signed-off-by: Yogesh Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/jfs_dmap.c | 3 +++ + fs/jfs/jfs_dmap.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c -index 3ad0a33e0443b..6fdf18caf241d 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c -@@ -2034,6 +2034,9 @@ dbAllocDmapLev(struct bmap * bmp, +@@ -1959,6 +1959,9 @@ dbAllocDmapLev(struct bmap * bmp, if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx)) return -ENOSPC; @@ -83,6 +81,3 @@ index 3ad0a33e0443b..6fdf18caf241d 100644 /* determine the block number within the file system corresponding * to the leaf at which free space was found. */ --- -2.39.2 - diff --git a/queue-6.1/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch b/queue-6.1/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch index f0aa875f044..ca1753e2552 100644 --- a/queue-6.1/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch +++ b/queue-6.1/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch @@ -23,15 +23,13 @@ Signed-off-by: Marco Morandini Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- - drivers/hid/hid-ids.h | 1 + - drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+) -diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index c0ba8d6f4978f..a9d6f8acf70b5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -571,6 +571,7 @@ +@@ -614,6 +614,7 @@ #define USB_DEVICE_ID_UGCI_FIGHTING 0x0030 #define USB_VENDOR_ID_HP 0x03f0 @@ -39,11 +37,9 @@ index c0ba8d6f4978f..a9d6f8acf70b5 100644 #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A 0x0a4a #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A 0x0b4a #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE 0x134a -diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 8de294aa3184a..a2ab338166e61 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -98,6 +98,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -96,6 +96,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A293), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A), HID_QUIRK_ALWAYS_POLL }, @@ -51,6 +47,3 @@ index 8de294aa3184a..a2ab338166e61 100644 { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A), HID_QUIRK_ALWAYS_POLL }, --- -2.39.2 - diff --git a/queue-6.1/mips-dec-prom-address-warray-bounds-warning.patch b/queue-6.1/mips-dec-prom-address-warray-bounds-warning.patch index 3ae68615e08..1231ca4bcc6 100644 --- a/queue-6.1/mips-dec-prom-address-warray-bounds-warning.patch +++ b/queue-6.1/mips-dec-prom-address-warray-bounds-warning.patch @@ -35,14 +35,12 @@ Signed-off-by: Gustavo A. R. Silva Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- - arch/mips/include/asm/dec/prom.h | 2 +- + arch/mips/include/asm/dec/prom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/mips/include/asm/dec/prom.h b/arch/mips/include/asm/dec/prom.h -index 09538ff5e9245..6f0405ba27d6d 100644 --- a/arch/mips/include/asm/dec/prom.h +++ b/arch/mips/include/asm/dec/prom.h -@@ -74,7 +74,7 @@ static inline bool prom_is_rex(u32 magic) +@@ -70,7 +70,7 @@ static inline bool prom_is_rex(u32 magic */ typedef struct { int pagesize; @@ -51,6 +49,3 @@ index 09538ff5e9245..6f0405ba27d6d 100644 } memmap; --- -2.39.2 - diff --git a/queue-6.1/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch b/queue-6.1/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch index 430fc7ff309..298e882552a 100644 --- a/queue-6.1/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch +++ b/queue-6.1/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch @@ -28,14 +28,12 @@ Signed-off-by: Christian Brauner Signed-off-by: Amir Goldstein Signed-off-by: Sasha Levin --- - fs/overlayfs/ovl_entry.h | 9 +++++++++ + fs/overlayfs/ovl_entry.h | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h -index 1a1adc697c553..3d34ce992f0d8 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h -@@ -28,6 +28,7 @@ struct ovl_sb { +@@ -32,6 +32,7 @@ struct ovl_sb { }; struct ovl_layer { @@ -43,7 +41,7 @@ index 1a1adc697c553..3d34ce992f0d8 100644 struct vfsmount *mnt; /* Trap in ovl inode cache */ struct inode *trap; -@@ -38,6 +39,14 @@ struct ovl_layer { +@@ -42,6 +43,14 @@ struct ovl_layer { int fsid; }; @@ -56,8 +54,5 @@ index 1a1adc697c553..3d34ce992f0d8 100644 +static_assert(__same_type(typeof_member(struct ovl_layer, mnt), struct vfsmount *)); + struct ovl_path { - struct ovl_layer *layer; + const struct ovl_layer *layer; struct dentry *dentry; --- -2.39.2 - diff --git a/queue-6.1/quota-fix-warning-in-dqgrab.patch b/queue-6.1/quota-fix-warning-in-dqgrab.patch index 033ffc0a758..b0a2273830e 100644 --- a/queue-6.1/quota-fix-warning-in-dqgrab.patch +++ b/queue-6.1/quota-fix-warning-in-dqgrab.patch @@ -84,14 +84,12 @@ Signed-off-by: Jan Kara Message-Id: <20230605140731.2427629-3-yebin10@huawei.com> Signed-off-by: Sasha Levin --- - fs/quota/dquot.c | 2 +- + fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c -index 0d3ffc727bb00..303987d29b9c9 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c -@@ -540,7 +540,7 @@ static void invalidate_dquots(struct super_block *sb, int type) +@@ -555,7 +555,7 @@ restart: continue; /* Wait for dquot users */ if (atomic_read(&dquot->dq_count)) { @@ -100,6 +98,3 @@ index 0d3ffc727bb00..303987d29b9c9 100644 spin_unlock(&dq_list_lock); /* * Once dqput() wakes us up, we know it's time to free --- -2.39.2 - diff --git a/queue-6.1/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch b/queue-6.1/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch index b7e21bb5ca1..1bd0a1ec80a 100644 --- a/queue-6.1/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch +++ b/queue-6.1/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch @@ -23,14 +23,12 @@ Signed-off-by: Jan Kara Message-Id: <20230605140731.2427629-2-yebin10@huawei.com> Signed-off-by: Sasha Levin --- - fs/quota/dquot.c | 3 ++- + fs/quota/dquot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c -index 770a2b1434856..0d3ffc727bb00 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c -@@ -2407,7 +2407,8 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, +@@ -2420,7 +2420,8 @@ int dquot_load_quota_sb(struct super_blo error = add_dquot_ref(sb, type); if (error) @@ -40,6 +38,3 @@ index 770a2b1434856..0d3ffc727bb00 100644 return error; out_fmt: --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 6df3335dfa7..a0865c95365 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -162,3 +162,4 @@ tcp-annotate-data-races-around-tp-notsent_lowat.patch tcp-annotate-data-races-around-icsk-icsk_user_timeou.patch tcp-annotate-data-races-around-fastopenq.max_qlen.patch net-phy-prevent-stale-pointer-dereference-in-phy_ini.patch +jbd2-recheck-chechpointing-non-dirty-buffer.patch diff --git a/queue-6.4/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch b/queue-6.4/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch index 55e0c524fc6..2de6a82aaab 100644 --- a/queue-6.4/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch +++ b/queue-6.4/alsa-emu10k1-roll-up-loops-in-dsp-setup-code-for-aud.patch @@ -16,14 +16,12 @@ Link: https://lore.kernel.org/r/20230510173917.3073107-3-oswald.buddenhagen@gmx. Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/emu10k1/emufx.c | 112 +++----------------------------------- + sound/pci/emu10k1/emufx.c | 112 +++------------------------------------------- 1 file changed, 9 insertions(+), 103 deletions(-) -diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c -index e053f0d58bdd0..2f3cfcfcdb9a3 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c -@@ -1536,14 +1536,8 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) +@@ -1559,14 +1559,8 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_G gpr += 2; /* Master volume (will be renamed later) */ @@ -40,7 +38,7 @@ index e053f0d58bdd0..2f3cfcfcdb9a3 100644 snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0); gpr += 2; -@@ -1627,102 +1621,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input)) +@@ -1653,102 +1647,14 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_G dev_dbg(emu->card->dev, "emufx.c: gpr=0x%x, tmp=0x%x\n", gpr, tmp); */ @@ -150,6 +148,3 @@ index e053f0d58bdd0..2f3cfcfcdb9a3 100644 } #if 0 --- -2.39.2 - diff --git a/queue-6.4/alsa-hda-realtek-add-quirks-for-rog-ally-cs35l41-aud.patch b/queue-6.4/alsa-hda-realtek-add-quirks-for-rog-ally-cs35l41-aud.patch index df59bdbe4b8..cb6bbf38727 100644 --- a/queue-6.4/alsa-hda-realtek-add-quirks-for-rog-ally-cs35l41-aud.patch +++ b/queue-6.4/alsa-hda-realtek-add-quirks-for-rog-ally-cs35l41-aud.patch @@ -19,14 +19,12 @@ Link: https://lore.kernel.org/r/20230621161714.9442-1-ruinairas1992@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/hda/patch_realtek.c | 46 +++++++++++++++++++++++++++++++++++ + sound/pci/hda/patch_realtek.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 6d8d9fc1da0b0..8c52d7014e79a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -6479,6 +6479,10 @@ enum { +@@ -7136,6 +7136,10 @@ enum { ALC294_FIXUP_ASUS_DUAL_SPK, ALC285_FIXUP_THINKPAD_X1_GEN7, ALC285_FIXUP_THINKPAD_HEADSET_JACK, @@ -37,7 +35,7 @@ index 6d8d9fc1da0b0..8c52d7014e79a 100644 ALC294_FIXUP_ASUS_HPE, ALC294_FIXUP_ASUS_COEF_1B, ALC294_FIXUP_ASUS_GX502_HP, -@@ -7687,6 +7691,47 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -8449,6 +8453,47 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC294_FIXUP_SPK2_TO_DAC1 }, @@ -85,7 +83,7 @@ index 6d8d9fc1da0b0..8c52d7014e79a 100644 [ALC285_FIXUP_THINKPAD_X1_GEN7] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_thinkpad_x1_gen7, -@@ -8259,6 +8304,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -9557,6 +9602,7 @@ static const struct snd_pci_quirk alc269 SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS), SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), @@ -93,6 +91,3 @@ index 6d8d9fc1da0b0..8c52d7014e79a 100644 SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS), SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC), --- -2.39.2 - diff --git a/queue-6.4/alsa-hda-realtek-fix-generic-fixup-definition-for-cs.patch b/queue-6.4/alsa-hda-realtek-fix-generic-fixup-definition-for-cs.patch index e37fbf7ce59..3a3d716a368 100644 --- a/queue-6.4/alsa-hda-realtek-fix-generic-fixup-definition-for-cs.patch +++ b/queue-6.4/alsa-hda-realtek-fix-generic-fixup-definition-for-cs.patch @@ -17,14 +17,12 @@ Link: https://lore.kernel.org/r/20230720082022.13033-1-vitalyr@opensource.cirrus Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- - sound/pci/hda/patch_realtek.c | 25 +++++++++++++++---------- + sound/pci/hda/patch_realtek.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 73cc705adb9e5..ee53d1badd86d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -7220,6 +7220,7 @@ enum { +@@ -7224,6 +7224,7 @@ enum { ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, ALC295_FIXUP_DELL_INSPIRON_TOP_SPEAKERS, ALC236_FIXUP_DELL_DUAL_CODECS, @@ -32,7 +30,7 @@ index 73cc705adb9e5..ee53d1badd86d 100644 }; /* A special fixup for Lenovo C940 and Yoga Duet 7; -@@ -9090,8 +9091,6 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -9135,8 +9136,6 @@ static const struct hda_fixup alc269_fix [ALC287_FIXUP_CS35L41_I2C_2] = { .type = HDA_FIXUP_FUNC, .v.func = cs35l41_fixup_i2c_two, @@ -41,7 +39,7 @@ index 73cc705adb9e5..ee53d1badd86d 100644 }, [ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED] = { .type = HDA_FIXUP_FUNC, -@@ -9228,6 +9227,12 @@ static const struct hda_fixup alc269_fixups[] = { +@@ -9273,6 +9272,12 @@ static const struct hda_fixup alc269_fix .chained = true, .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE, }, @@ -54,7 +52,7 @@ index 73cc705adb9e5..ee53d1badd86d 100644 }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { -@@ -9752,14 +9757,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -9798,14 +9803,14 @@ static const struct snd_pci_quirk alc269 SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK), SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK), SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK), @@ -77,6 +75,3 @@ index 73cc705adb9e5..ee53d1badd86d 100644 SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY), SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION), --- -2.39.2 - diff --git a/queue-6.4/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch b/queue-6.4/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch index 66c4278ff61..08d1232a000 100644 --- a/queue-6.4/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch +++ b/queue-6.4/drm-radeon-fix-integer-overflow-in-radeon_cs_parser_.patch @@ -21,14 +21,12 @@ Signed-off-by: hackyzh002 Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- - drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- + drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c -index 7b54606783821..ba64dad1d7c9e 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c -@@ -271,7 +271,8 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) +@@ -270,7 +270,8 @@ int radeon_cs_parser_init(struct radeon_ { struct drm_radeon_cs *cs = data; uint64_t *chunk_array_ptr; @@ -38,6 +36,3 @@ index 7b54606783821..ba64dad1d7c9e 100644 u32 ring = RADEON_CS_RING_GFX; s32 priority = 0; --- -2.39.2 - diff --git a/queue-6.4/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch b/queue-6.4/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch index 25b6556b744..e8b03e8b953 100644 --- a/queue-6.4/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch +++ b/queue-6.4/fs-jfs-fix-null-ptr-deref-read-in-txbegin.patch @@ -21,14 +21,12 @@ Signed-off-by: Immad Mir Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/namei.c | 5 +++++ + fs/jfs/namei.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c -index 7a55d14cc1af0..f155ad6650bd4 100644 --- a/fs/jfs/namei.c +++ b/fs/jfs/namei.c -@@ -798,6 +798,11 @@ static int jfs_link(struct dentry *old_dentry, +@@ -799,6 +799,11 @@ static int jfs_link(struct dentry *old_d if (rc) goto out; @@ -40,6 +38,3 @@ index 7a55d14cc1af0..f155ad6650bd4 100644 tid = txBegin(ip->i_sb, 0); mutex_lock_nested(&JFS_IP(dir)->commit_mutex, COMMIT_MUTEX_PARENT); --- -2.39.2 - diff --git a/queue-6.4/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch b/queue-6.4/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch index 4a3939695e5..e3baf5a2fc9 100644 --- a/queue-6.4/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch +++ b/queue-6.4/fs-jfs-fix-ubsan-array-index-out-of-bounds-in-dballo.patch @@ -66,14 +66,12 @@ Signed-off-by: Yogesh Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- - fs/jfs/jfs_dmap.c | 3 +++ + fs/jfs/jfs_dmap.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c -index cc1fed285b2d6..3514cfcd4abbf 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c -@@ -2021,6 +2021,9 @@ dbAllocDmapLev(struct bmap * bmp, +@@ -1959,6 +1959,9 @@ dbAllocDmapLev(struct bmap * bmp, if (dbFindLeaf((dmtree_t *) & dp->tree, l2nb, &leafidx)) return -ENOSPC; @@ -83,6 +81,3 @@ index cc1fed285b2d6..3514cfcd4abbf 100644 /* determine the block number within the file system corresponding * to the leaf at which free space was found. */ --- -2.39.2 - diff --git a/queue-6.4/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch b/queue-6.4/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch index cff88eddeee..ec2516b9a3e 100644 --- a/queue-6.4/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch +++ b/queue-6.4/hid-add-quirk-for-03f0-464a-hp-elite-presenter-mouse.patch @@ -23,15 +23,13 @@ Signed-off-by: Marco Morandini Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- - drivers/hid/hid-ids.h | 1 + - drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-quirks.c | 1 + 2 files changed, 2 insertions(+) -diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 479516bbb61bf..64842926aff64 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -581,6 +581,7 @@ +@@ -620,6 +620,7 @@ #define USB_DEVICE_ID_UGCI_FIGHTING 0x0030 #define USB_VENDOR_ID_HP 0x03f0 @@ -39,11 +37,9 @@ index 479516bbb61bf..64842926aff64 100644 #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A 0x0a4a #define USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A 0x0b4a #define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE 0x134a -diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index e5dcc47586ee4..83c3322fcf187 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -96,6 +96,7 @@ static const struct hid_device_id hid_quirks[] = { +@@ -96,6 +96,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A096), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_HOLTEK_ALT, USB_DEVICE_ID_HOLTEK_ALT_KEYBOARD_A293), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0A4A), HID_QUIRK_ALWAYS_POLL }, @@ -51,6 +47,3 @@ index e5dcc47586ee4..83c3322fcf187 100644 { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_LOGITECH_OEM_USB_OPTICAL_MOUSE_0B4A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A), HID_QUIRK_ALWAYS_POLL }, --- -2.39.2 - diff --git a/queue-6.4/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch b/queue-6.4/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch index d7d9ddc2796..38512f7a3ec 100644 --- a/queue-6.4/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch +++ b/queue-6.4/ovl-check-type-and-offset-of-struct-vfsmount-in-ovl_.patch @@ -28,14 +28,12 @@ Signed-off-by: Christian Brauner Signed-off-by: Amir Goldstein Signed-off-by: Sasha Levin --- - fs/overlayfs/ovl_entry.h | 9 +++++++++ + fs/overlayfs/ovl_entry.h | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h -index 28348c44ea5b2..8d81e88f1d1ef 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h -@@ -27,6 +27,7 @@ struct ovl_sb { +@@ -32,6 +32,7 @@ struct ovl_sb { }; struct ovl_layer { @@ -43,7 +41,7 @@ index 28348c44ea5b2..8d81e88f1d1ef 100644 struct vfsmount *mnt; /* Trap in ovl inode cache */ struct inode *trap; -@@ -37,6 +38,14 @@ struct ovl_layer { +@@ -42,6 +43,14 @@ struct ovl_layer { int fsid; }; @@ -56,8 +54,5 @@ index 28348c44ea5b2..8d81e88f1d1ef 100644 +static_assert(__same_type(typeof_member(struct ovl_layer, mnt), struct vfsmount *)); + struct ovl_path { - struct ovl_layer *layer; + const struct ovl_layer *layer; struct dentry *dentry; --- -2.39.2 - diff --git a/queue-6.4/quota-fix-warning-in-dqgrab.patch b/queue-6.4/quota-fix-warning-in-dqgrab.patch index c20048bc9c2..982c7d1d8c2 100644 --- a/queue-6.4/quota-fix-warning-in-dqgrab.patch +++ b/queue-6.4/quota-fix-warning-in-dqgrab.patch @@ -84,14 +84,12 @@ Signed-off-by: Jan Kara Message-Id: <20230605140731.2427629-3-yebin10@huawei.com> Signed-off-by: Sasha Levin --- - fs/quota/dquot.c | 2 +- + fs/quota/dquot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c -index 44175f37bfeb5..3d1a71d2909bb 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c -@@ -546,7 +546,7 @@ static void invalidate_dquots(struct super_block *sb, int type) +@@ -555,7 +555,7 @@ restart: continue; /* Wait for dquot users */ if (atomic_read(&dquot->dq_count)) { @@ -100,6 +98,3 @@ index 44175f37bfeb5..3d1a71d2909bb 100644 spin_unlock(&dq_list_lock); /* * Once dqput() wakes us up, we know it's time to free --- -2.39.2 - diff --git a/queue-6.4/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch b/queue-6.4/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch index 70f07f2596e..d7b4aaab3d7 100644 --- a/queue-6.4/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch +++ b/queue-6.4/quota-properly-disable-quotas-when-add_dquot_ref-fai.patch @@ -23,14 +23,12 @@ Signed-off-by: Jan Kara Message-Id: <20230605140731.2427629-2-yebin10@huawei.com> Signed-off-by: Sasha Levin --- - fs/quota/dquot.c | 3 ++- + fs/quota/dquot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c -index 1d652af48f0b1..44175f37bfeb5 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c -@@ -2415,7 +2415,8 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, +@@ -2420,7 +2420,8 @@ int dquot_load_quota_sb(struct super_blo error = add_dquot_ref(sb, type); if (error) @@ -40,6 +38,3 @@ index 1d652af48f0b1..44175f37bfeb5 100644 return error; out_fmt: --- -2.39.2 - diff --git a/queue-6.4/series b/queue-6.4/series index 530dd09d869..7469d103fa0 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -217,3 +217,4 @@ tcp-annotate-data-races-around-tp-notsent_lowat.patch tcp-annotate-data-races-around-icsk-icsk_user_timeou.patch tcp-annotate-data-races-around-fastopenq.max_qlen.patch net-phy-prevent-stale-pointer-dereference-in-phy_ini.patch +jbd2-recheck-chechpointing-non-dirty-buffer.patch -- 2.47.3