Skip to contentSkip to conversation

6.1.105-rc1 review

PATCH In review Greg Kroah-Hartman 5 participants 156 messages Aug 12, 2024 – Aug 13, 2024 Page 2 of 2

Subsystems (2)
Stable branch netfilter
lore
Share & tools
lore
author maintainer
#149 lore raw

PATCH 149/150 i2c: qcom-geni: fix missing clk_disable_unprepare() and geni_se_resources_off()

In reply to Greg Kroah-Hartman

6.1-stable review patch. If anyone has any objections, please let me know.

------------------

From: Yang Yingliang <[email protected]>

commit 043465b66506e8c647cdd38a2db1f2ee0f369a1b upstream.

Add missing clk_disable_unprepare() and geni_se_resources_off() in the error path in geni_i2c_probe().

Fixes 14d02fbadb5d ("i2c: qcom-geni: add desc struct to prepare support for I2C Master Hub variant")
Signed-off-by Yang Yingliang <[email protected]>
Reviewed-by Andi Shyti <[email protected]>
Signed-off-by Wolfram Sang <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/i2c/busses/i2c-qcom-geni.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-qcom-geni.c +7 -1
@@ -859,6 +859,7 @@ static int geni_i2c_probe(struct platfor
 	ret = geni_se_resources_on(&gi2c->se);
 	if (ret) {
 		dev_err(dev, "Error turning on resources %d\n", ret);
+		clk_disable_unprepare(gi2c->core_clk);
 		return ret;
 	}
 	proto = geni_se_read_proto(&gi2c->se);

@@ -878,8 +879,11 @@ static int geni_i2c_probe(struct platfor
 		/* FIFO is disabled, so we can only use GPI DMA */
 		gi2c->gpi_mode = true;
 		ret = setup_gpi_dma(gi2c);
-		if (ret)
+		if (ret) {
+			geni_se_resources_off(&gi2c->se);
+			clk_disable_unprepare(gi2c->core_clk);
 			return dev_err_probe(dev, ret, "Failed to setup GPI DMA mode\n");
+		}
 
 		dev_dbg(dev, "Using GPI DMA mode for I2C\n");
 	} else {

@@ -892,6 +896,8 @@ static int geni_i2c_probe(struct platfor
 
 		if (!tx_depth) {
 			dev_err(dev, "Invalid TX FIFO depth\n");
+			geni_se_resources_off(&gi2c->se);
+			clk_disable_unprepare(gi2c->core_clk);
 			return -EINVAL;
 		}
author maintainer
#150 lore raw

PATCH 150/150 btrfs: fix double inode unlock for direct IO sync writes

In reply to Greg Kroah-Hartman

6.1-stable review patch. If anyone has any objections, please let me know.

------------------

From: Filipe Manana <[email protected]>

commit e0391e92f9ab4fb3dbdeb139c967dcfa7ac4b115 upstream.

If we do a direct IO sync write, at btrfs_sync_file(), and we need to skip inode logging or we get an error starting a transaction or an error when flushing delalloc, we end up unlocking the inode when we shouldn't under the 'out_release_extents' label, and then unlock it again at btrfs_direct_write().

Fix that by checking if we have to skip inode unlocking under that label.

Reported-by [email protected]
Link https://lore.kernel.org/linux-btrfs/[email protected]/ open here
Fixes 939b656bc8ab ("btrfs: fix corruption after buffer fault in during direct IO append write")
Reviewed-by Josef Bacik <[email protected]>
Signed-off-by Filipe Manana <[email protected]>
Signed-off-by David Sterba <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 fs/btrfs/file.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/file.c +4 -1
@@ -2037,7 +2037,10 @@ out:
 
 out_release_extents:
 	btrfs_release_log_ctx_extents(&ctx);
-	btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
+	if (skip_ilock)
+		up_write(&BTRFS_I(inode)->i_mmap_lock);
+	else
+		btrfs_inode_unlock(inode, BTRFS_ILOCK_MMAP);
 	goto out;
 }
Tested-by on the v1 series
#152 lore raw
In reply to Greg Kroah-Hartman

Hi!

Quoted 4 lines

This is the start of the stable review cycle for the 6.1.105 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

CIP testing did not find any problems here:

https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.1.y

Tested-by Pavel Machek (CIP) <[email protected]>

Best regards,
Pavel

Signature · 2 lines
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#153 lore raw
In reply to Greg Kroah-Hartman
Quoted 8 lines · Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.105 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

Responses should be made by Wed, 14 Aug 2024 16:00:26 +0000. Anything received after that time might be too late.

Building parisc64:C3700:smp:net=pcnet:initrd ... failed
------------
Error log:
In file included from /home/groeck/src/linux-stable/include/linux/fs.h:45,
from /home/groeck/src/linux-stable/include/linux/huge_mm.h:8, from /home/groeck/src/linux-stable/include/linux/mm.h:745,
from /home/groeck/src/linux-stable/include/linux/pid_namespace.h:7, from /home/groeck/src/linux-stable/include/linux/ptrace.h:10, from /home/groeck/src/linux-stable/arch/parisc/kernel/asm-offsets.c:20:
/home/groeck/src/linux-stable/include/linux/slab.h:228: warning: "ARCH_KMALLOC_MINALIGN" redefined
228 | #define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN

In file included from /home/groeck/src/linux-stable/arch/parisc/include/asm/atomic.h:23,
from /home/groeck/src/linux-stable/include/linux/atomic.h:7,
from /home/groeck/src/linux-stable/include/linux/rcupdate.h:25,
from /home/groeck/src/linux-stable/include/linux/rculist.h:11,
from /home/groeck/src/linux-stable/include/linux/pid.h:5,
from /home/groeck/src/linux-stable/include/linux/sched.h:14,
from /home/groeck/src/linux-stable/arch/parisc/kernel/asm-offsets.c:18:
/home/groeck/src/linux-stable/arch/parisc/include/asm/cache.h:28: note: this is the location of the previous definition
28 | #define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */

Guenter

#154 lore raw
Quoted 7 lines · Guenter Roeck
Quoted 5 lines · Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.105 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

Quoted 5 lines
Quoted 3 lines

Responses should be made by Wed, 14 Aug 2024 16:00:26 +0000. Anything received after that time might be too late.

Building parisc64:C3700:smp:net=pcnet:initrd ... failed

As Guenter reported,
Parisc builds failed.

* parisc, build
- gcc-11-allnoconfig
- gcc-11-defconfig
- gcc-11-tinyconfig

Quoted 11 lines

------------
Error log:
In file included from /home/groeck/src/linux-stable/include/linux/fs.h:45,
from /home/groeck/src/linux-stable/include/linux/huge_mm.h:8, from /home/groeck/src/linux-stable/include/linux/mm.h:745,
from /home/groeck/src/linux-stable/include/linux/pid_namespace.h:7, from /home/groeck/src/linux-stable/include/linux/ptrace.h:10, from /home/groeck/src/linux-stable/arch/parisc/kernel/asm-offsets.c:20:
/home/groeck/src/linux-stable/include/linux/slab.h:228: warning: "ARCH_KMALLOC_MINALIGN" redefined
228 | #define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN

Quoted 10 lines

In file included from /home/groeck/src/linux-stable/arch/parisc/include/asm/atomic.h:23,
from /home/groeck/src/linux-stable/include/linux/atomic.h:7,
from /home/groeck/src/linux-stable/include/linux/rcupdate.h:25,
from /home/groeck/src/linux-stable/include/linux/rculist.h:11,
from /home/groeck/src/linux-stable/include/linux/pid.h:5,
from /home/groeck/src/linux-stable/include/linux/sched.h:14,
from /home/groeck/src/linux-stable/arch/parisc/kernel/asm-offsets.c:18:
/home/groeck/src/linux-stable/arch/parisc/include/asm/cache.h:28: note: this is the location of the previous definition
28 | #define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */

Thanks for the report.

Quoted 2 lines

Guenter

author maintainer
#155 lore raw
In reply to Guenter Roeck
Quoted 22 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.105 release. There are 150 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.

Responses should be made by Wed, 14 Aug 2024 16:00:26 +0000. Anything received after that time might be too late.

Building parisc64:C3700:smp:net=pcnet:initrd ... failed
------------
Error log:
In file included from /home/groeck/src/linux-stable/include/linux/fs.h:45,
from /home/groeck/src/linux-stable/include/linux/huge_mm.h:8, from /home/groeck/src/linux-stable/include/linux/mm.h:745,
from /home/groeck/src/linux-stable/include/linux/pid_namespace.h:7, from /home/groeck/src/linux-stable/include/linux/ptrace.h:10, from /home/groeck/src/linux-stable/arch/parisc/kernel/asm-offsets.c:20:
/home/groeck/src/linux-stable/include/linux/slab.h:228: warning: "ARCH_KMALLOC_MINALIGN" redefined
228 | #define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN

Quoted 10 lines

In file included from /home/groeck/src/linux-stable/arch/parisc/include/asm/atomic.h:23,
from /home/groeck/src/linux-stable/include/linux/atomic.h:7,
from /home/groeck/src/linux-stable/include/linux/rcupdate.h:25,
from /home/groeck/src/linux-stable/include/linux/rculist.h:11,
from /home/groeck/src/linux-stable/include/linux/pid.h:5,
from /home/groeck/src/linux-stable/include/linux/sched.h:14,
from /home/groeck/src/linux-stable/arch/parisc/kernel/asm-offsets.c:18:
/home/groeck/src/linux-stable/arch/parisc/include/asm/cache.h:28: note: this is the location of the previous definition
28 | #define ARCH_KMALLOC_MINALIGN 16 /* ldcw requires 16-byte alignment */

Thanks, I'll go drop the offending commit now.

greg k-h