linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 4491 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  tools/testing/selftests/Makefile

between commit:

  073d71c5118f4 ("selftests/filesystems: add a test for freezing a shared block device")

from the vfs-brauner-fixes tree and commit:

  c6c917c1ecb48 ("Merge branch 'vfs-7.4.misc' into vfs.all")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined tools/testing/selftests/Makefile
index 07c3719f8b04b,32dde7b95848e..0000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -34,13 -34,11 +34,13 @@@ TARGETS += exe
  TARGETS += fchmodat2
  TARGETS += filesystems
  TARGETS += filesystems/binderfs
 +TARGETS += filesystems/configfs
  TARGETS += filesystems/epoll
  TARGETS += filesystems/eventfd
  TARGETS += filesystems/failfs
  TARGETS += filesystems/fat
  TARGETS += filesystems/file_stressor
 +TARGETS += filesystems/freeze
  TARGETS += filesystems/openat2
  TARGETS += filesystems/open_tree_ns
  TARGETS += filesystems/overlayfs
@@@ -99,7 -97,6 +99,7 @@@ TARGETS += net/packetdril
  TARGETS += net/ppp
  TARGETS += net/rds
  TARGETS += net/tcp_ao
 +TARGETS += nfsd
  TARGETS += nolibc
  TARGETS += pci_endpoint
  TARGETS += pcie_bwctrl
@@@ -180,10 -177,6 +180,10 @@@ endi
  # of the targets gets built.
  FORCE_TARGETS ?=
  
 +# Remember dry runs for the build report before MAKEFLAGS may be cleared.
 +KSFT_BUILD_REPORT_DRY_RUN := $(strip $(foreach f,n t q,$(findstring $(f),$(firstword -$(MAKEFLAGS)))))
 +export KSFT_BUILD_REPORT_DRY_RUN
 +
  # Clear LDFLAGS and MAKEFLAGS when implicit rules are missing.  This provides
  # implicit rules to sub-test Makefiles which avoids build failures in test
  # Makefile that don't have explicit build rules.
@@@ -228,10 -221,6 +228,10 @@@ ARCH           ?= $(SUBARCH
  export BUILD
  export KHDR_INCLUDES
  
 +# Version of the optional KSFT_BUILD_REPORT format written by these rules.
 +KSFT_BUILD_REPORT_VERSION := 1
 +include $(top_srcdir)/tools/testing/selftests/build_report.mk
 +
  # set default goal to all, so make without a target runs all, even when
  # all isn't the first target in the file.
  .DEFAULT_GOAL := all
@@@ -240,13 -229,11 +240,13 @@@ all
  	@ret=1;							\
  	for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do	\
  		BUILD_TARGET=$$BUILD/$$TARGET;			\
 -		mkdir $$BUILD_TARGET  -p;			\
 +		mkdir -p $$BUILD_TARGET &&			\
  		$(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET	\
 -				O=$(abs_objtree)		\
 -				$(if $(FORCE_TARGETS),|| exit);	\
 -		ret=$$((ret * $$?));				\
 +				O=$(abs_objtree);		\
 +		status=$$?;					\
 +		$(call ksft_record_build_status,all,$$TARGET);	\
 +		$(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
 +		[ $$status -eq 0 ] && ret=0;			\
  	done; exit $$ret;
  
  run_tests: all
@@@ -303,7 -290,7 +303,7 @@@ ifdef INSTALL_PAT
  	install -m 744 kselftest/ktap_helpers.sh $(INSTALL_PATH)/kselftest/
  	install -m 744 kselftest/ksft.py $(INSTALL_PATH)/kselftest/
  	install -m 744 run_kselftest.sh $(INSTALL_PATH)/
 -	rm -f $(TEST_LIST)
 +	: > $(TEST_LIST)
  	@ret=1;	\
  	for TARGET in $(TARGETS) $(INSTALL_DEP_TARGETS); do \
  		BUILD_TARGET=$$BUILD/$$TARGET;	\
@@@ -311,11 -298,9 +311,11 @@@
  				INSTALL_PATH=$(INSTALL_PATH)/$$TARGET \
  				SRC_PATH=$(shell readlink -e $$(pwd)) \
  				OBJ_PATH=$(INSTALL_PATH) \
 -				O=$(abs_objtree)		\
 -				$(if $(FORCE_TARGETS),|| exit);	\
 -		ret=$$((ret * $$?));		\
 +				O=$(abs_objtree);		\
 +		status=$$?;				\
 +		$(call ksft_record_build_status,install,$$TARGET); \
 +		$(if $(FORCE_TARGETS),[ $$status -eq 0 ] || exit $$status;) \
 +		[ $$status -eq 0 ] && ret=0;		\
  	done; exit $$ret;
  
  
@@@ -329,9 -314,6 +329,9 @@@
  		printf "Emit Tests for $$TARGET\n"; \
  		$(MAKE) -s --no-print-directory OUTPUT=$$BUILD_TARGET COLLECTION=$$TARGET \
  			-C $$TARGET emit_tests >> $(TEST_LIST); \
 +		status=$$?; \
 +		$(call ksft_record_build_status,install,$$TARGET); \
 +		(exit $$status); \
  	done;
  	@VERSION=$$(git describe HEAD 2>/dev/null); \
  	if [ -n "$$VERSION" ]; then \

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 807 bytes --]

On Thu, Mar 26, 2026 at 02:24:26PM +0100, Christian Brauner wrote:
> On Wed, Mar 25, 2026 at 08:13:56AM -0700, Darrick J. Wong wrote:

> > That looks correct to me, thanks for pointing out the merge conflict. :)

> Wait wait, the vfs.fixes tree is merged into the vfs.all tree which
> should have the merge conflict resolution:

I'm still merging the version from next-20260312, see my report from
yesterday:

  https://lore.kernel.org/linux-next/acPV19IY3Gna6Ira@sirena.org.uk/T/#u

The initially reported issue was fixed, but there's a rather similar new
issue showed up, I suspect it was masked by the prior issue since it's
in a separate kselftest directory (this is namespaces, prior one was in
filesystems) and the kselftest build system is less good at surfacing
all errors than the main kernel one.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Christian Brauner]

On Wed, Mar 25, 2026 at 08:13:56AM -0700, Darrick J. Wong wrote:
> On Wed, Mar 25, 2026 at 01:29:37PM +0000, Mark Brown wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the vfs-brauner tree got a conflict in:
> > 
> >   fs/iomap/bio.c
> > 
> > between commit:
> > 
> >   f621324dfb3d6 ("iomap: fix lockdep complaint when reads fail")
> > 
> > from the vfs-brauner-fixes tree and commit:
> > 
> >   e8f9cf03c9dc9 ("iomap: support ioends for buffered reads")
> > 
> > from the vfs-brauner tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> 
> That looks correct to me, thanks for pointing out the merge conflict. :)

Wait wait, the vfs.fixes tree is merged into the vfs.all tree which
should have the merge conflict resolution:

commit 45933bb2dca2b8a5c81cd50947b7d0f9c381c867
Merge: a61ed0d2b28c 1b63f91d1c90
Author:     Christian Brauner <brauner@kernel.org>
AuthorDate: Tue Mar 24 23:38:16 2026 +0100
Commit:     Christian Brauner <brauner@kernel.org>
CommitDate: Tue Mar 24 23:38:16 2026 +0100

    Merge branch 'vfs-7.1.integrity' into vfs.all
    
    Signed-off-by: Christian Brauner <brauner@kernel.org>
    
    # Conflicts:
    #       fs/iomap/bio.c

diff --cc fs/iomap/bio.c
index edd908183058,f989ffcaac96..4504f4633f17
--- a/fs/iomap/bio.c
+++ b/fs/iomap/bio.c
@@@ -8,66 -9,33 +9,77 @@@
  #include "internal.h"
  #include "trace.h"
  
 +static DEFINE_SPINLOCK(failed_read_lock);
 +static struct bio_list failed_read_list = BIO_EMPTY_LIST;
 +
- static void __iomap_read_end_io(struct bio *bio)
+ static u32 __iomap_read_end_io(struct bio *bio, int error)
  {
- 	int error = blk_status_to_errno(bio->bi_status);
  	struct folio_iter fi;
+ 	u32 folio_count = 0;
  
- 	bio_for_each_folio_all(fi, bio)
+ 	bio_for_each_folio_all(fi, bio) {
  		iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error);
+ 		folio_count++;
+ 	}
+ 	if (bio_integrity(bio))
+ 		fs_bio_integrity_free(bio);
  	bio_put(bio);
+ 	return folio_count;
  }
  
 +static void
 +iomap_fail_reads(
 +	struct work_struct	*work)
 +{
 +	struct bio		*bio;
 +	struct bio_list		tmp = BIO_EMPTY_LIST;
 +	unsigned long		flags;
 +
 +	spin_lock_irqsave(&failed_read_lock, flags);
 +	bio_list_merge_init(&tmp, &failed_read_list);
 +	spin_unlock_irqrestore(&failed_read_lock, flags);
 +
 +	while ((bio = bio_list_pop(&tmp)) != NULL) {
- 		__iomap_read_end_io(bio);
++		__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
 +		cond_resched();
 +	}
 +}
 +
 +static DECLARE_WORK(failed_read_work, iomap_fail_reads);
 +
 +static void iomap_fail_buffered_read(struct bio *bio)
 +{
 +	unsigned long flags;
 +
 +	/*
 +	 * Bounce I/O errors to a workqueue to avoid nested i_lock acquisitions
 +	 * in the fserror code.  The caller no longer owns the bio reference
 +	 * after the spinlock drops.
 +	 */
 +	spin_lock_irqsave(&failed_read_lock, flags);
 +	if (bio_list_empty(&failed_read_list))
 +		WARN_ON_ONCE(!schedule_work(&failed_read_work));
 +	bio_list_add(&failed_read_list, bio);
 +	spin_unlock_irqrestore(&failed_read_lock, flags);
 +}
 +
  static void iomap_read_end_io(struct bio *bio)
  {
 -	__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
 +	if (bio->bi_status) {
 +		iomap_fail_buffered_read(bio);
 +		return;
 +	}
 +
- 	__iomap_read_end_io(bio);
++	__iomap_read_end_io(bio, 0);
+ }
+ 
+ u32 iomap_finish_ioend_buffered_read(struct iomap_ioend *ioend)
+ {
+ 	return __iomap_read_end_io(&ioend->io_bio, ioend->io_error);
  }
  
- static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx)
+ static void iomap_bio_submit_read(const struct iomap_iter *iter,
+ 		struct iomap_read_folio_ctx *ctx)
  {
  	struct bio *bio = ctx->read_ctx;
  

> 
> --D
> 
> > diff --cc fs/iomap/bio.c
> > index edd908183058f,f989ffcaac96d..0000000000000
> > --- a/fs/iomap/bio.c
> > +++ b/fs/iomap/bio.c
> > @@@ -8,66 -9,33 +9,78 @@@
> >   #include "internal.h"
> >   #include "trace.h"
> >   
> >  +static DEFINE_SPINLOCK(failed_read_lock);
> >  +static struct bio_list failed_read_list = BIO_EMPTY_LIST;
> >  +
> > - static void __iomap_read_end_io(struct bio *bio)
> > + static u32 __iomap_read_end_io(struct bio *bio, int error)
> >   {
> > - 	int error = blk_status_to_errno(bio->bi_status);
> >   	struct folio_iter fi;
> > + 	u32 folio_count = 0;
> >   
> > - 	bio_for_each_folio_all(fi, bio)
> > + 	bio_for_each_folio_all(fi, bio) {
> >   		iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error);
> > + 		folio_count++;
> > + 	}
> > + 	if (bio_integrity(bio))
> > + 		fs_bio_integrity_free(bio);
> >   	bio_put(bio);
> > + 	return folio_count;
> >   }
> >   
> >  +static void
> >  +iomap_fail_reads(
> >  +	struct work_struct	*work)
> >  +{
> >  +	struct bio		*bio;
> >  +	struct bio_list		tmp = BIO_EMPTY_LIST;
> >  +	unsigned long		flags;
> >  +
> >  +	spin_lock_irqsave(&failed_read_lock, flags);
> >  +	bio_list_merge_init(&tmp, &failed_read_list);
> >  +	spin_unlock_irqrestore(&failed_read_lock, flags);
> >  +
> >  +	while ((bio = bio_list_pop(&tmp)) != NULL) {
> > - 		__iomap_read_end_io(bio);
> > ++		__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
> >  +		cond_resched();
> >  +	}
> >  +}
> >  +
> >  +static DECLARE_WORK(failed_read_work, iomap_fail_reads);
> >  +
> >  +static void iomap_fail_buffered_read(struct bio *bio)
> >  +{
> >  +	unsigned long flags;
> >  +
> >  +	/*
> >  +	 * Bounce I/O errors to a workqueue to avoid nested i_lock acquisitions
> >  +	 * in the fserror code.  The caller no longer owns the bio reference
> >  +	 * after the spinlock drops.
> >  +	 */
> >  +	spin_lock_irqsave(&failed_read_lock, flags);
> >  +	if (bio_list_empty(&failed_read_list))
> >  +		WARN_ON_ONCE(!schedule_work(&failed_read_work));
> >  +	bio_list_add(&failed_read_list, bio);
> >  +	spin_unlock_irqrestore(&failed_read_lock, flags);
> >  +}
> >  +
> >   static void iomap_read_end_io(struct bio *bio)
> >   {
> >  -	__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
> >  +	if (bio->bi_status) {
> >  +		iomap_fail_buffered_read(bio);
> >  +		return;
> >  +	}
> >  +
> > - 	__iomap_read_end_io(bio);
> > ++	__iomap_read_end_io(bio, 0);
> >   }
> >   
> > - static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx)
> > ++
> > + u32 iomap_finish_ioend_buffered_read(struct iomap_ioend *ioend)
> > + {
> > + 	return __iomap_read_end_io(&ioend->io_bio, ioend->io_error);
> > + }
> > + 
> > + static void iomap_bio_submit_read(const struct iomap_iter *iter,
> > + 		struct iomap_read_folio_ctx *ctx)
> >   {
> >   	struct bio *bio = ctx->read_ctx;
> >   
> 
> 

Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Christoph Hellwig]

The merge looks good, thanks!

Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Darrick J. Wong]

On Wed, Mar 25, 2026 at 01:29:37PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/iomap/bio.c
> 
> between commit:
> 
>   f621324dfb3d6 ("iomap: fix lockdep complaint when reads fail")
> 
> from the vfs-brauner-fixes tree and commit:
> 
>   e8f9cf03c9dc9 ("iomap: support ioends for buffered reads")
> 
> from the vfs-brauner tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

That looks correct to me, thanks for pointing out the merge conflict. :)

--D

> diff --cc fs/iomap/bio.c
> index edd908183058f,f989ffcaac96d..0000000000000
> --- a/fs/iomap/bio.c
> +++ b/fs/iomap/bio.c
> @@@ -8,66 -9,33 +9,78 @@@
>   #include "internal.h"
>   #include "trace.h"
>   
>  +static DEFINE_SPINLOCK(failed_read_lock);
>  +static struct bio_list failed_read_list = BIO_EMPTY_LIST;
>  +
> - static void __iomap_read_end_io(struct bio *bio)
> + static u32 __iomap_read_end_io(struct bio *bio, int error)
>   {
> - 	int error = blk_status_to_errno(bio->bi_status);
>   	struct folio_iter fi;
> + 	u32 folio_count = 0;
>   
> - 	bio_for_each_folio_all(fi, bio)
> + 	bio_for_each_folio_all(fi, bio) {
>   		iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error);
> + 		folio_count++;
> + 	}
> + 	if (bio_integrity(bio))
> + 		fs_bio_integrity_free(bio);
>   	bio_put(bio);
> + 	return folio_count;
>   }
>   
>  +static void
>  +iomap_fail_reads(
>  +	struct work_struct	*work)
>  +{
>  +	struct bio		*bio;
>  +	struct bio_list		tmp = BIO_EMPTY_LIST;
>  +	unsigned long		flags;
>  +
>  +	spin_lock_irqsave(&failed_read_lock, flags);
>  +	bio_list_merge_init(&tmp, &failed_read_list);
>  +	spin_unlock_irqrestore(&failed_read_lock, flags);
>  +
>  +	while ((bio = bio_list_pop(&tmp)) != NULL) {
> - 		__iomap_read_end_io(bio);
> ++		__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
>  +		cond_resched();
>  +	}
>  +}
>  +
>  +static DECLARE_WORK(failed_read_work, iomap_fail_reads);
>  +
>  +static void iomap_fail_buffered_read(struct bio *bio)
>  +{
>  +	unsigned long flags;
>  +
>  +	/*
>  +	 * Bounce I/O errors to a workqueue to avoid nested i_lock acquisitions
>  +	 * in the fserror code.  The caller no longer owns the bio reference
>  +	 * after the spinlock drops.
>  +	 */
>  +	spin_lock_irqsave(&failed_read_lock, flags);
>  +	if (bio_list_empty(&failed_read_list))
>  +		WARN_ON_ONCE(!schedule_work(&failed_read_work));
>  +	bio_list_add(&failed_read_list, bio);
>  +	spin_unlock_irqrestore(&failed_read_lock, flags);
>  +}
>  +
>   static void iomap_read_end_io(struct bio *bio)
>   {
>  -	__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
>  +	if (bio->bi_status) {
>  +		iomap_fail_buffered_read(bio);
>  +		return;
>  +	}
>  +
> - 	__iomap_read_end_io(bio);
> ++	__iomap_read_end_io(bio, 0);
>   }
>   
> - static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx)
> ++
> + u32 iomap_finish_ioend_buffered_read(struct iomap_ioend *ioend)
> + {
> + 	return __iomap_read_end_io(&ioend->io_bio, ioend->io_error);
> + }
> + 
> + static void iomap_bio_submit_read(const struct iomap_iter *iter,
> + 		struct iomap_read_folio_ctx *ctx)
>   {
>   	struct bio *bio = ctx->read_ctx;
>   

linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 3286 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/iomap/bio.c

between commit:

  f621324dfb3d6 ("iomap: fix lockdep complaint when reads fail")

from the vfs-brauner-fixes tree and commit:

  e8f9cf03c9dc9 ("iomap: support ioends for buffered reads")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/iomap/bio.c
index edd908183058f,f989ffcaac96d..0000000000000
--- a/fs/iomap/bio.c
+++ b/fs/iomap/bio.c
@@@ -8,66 -9,33 +9,78 @@@
  #include "internal.h"
  #include "trace.h"
  
 +static DEFINE_SPINLOCK(failed_read_lock);
 +static struct bio_list failed_read_list = BIO_EMPTY_LIST;
 +
- static void __iomap_read_end_io(struct bio *bio)
+ static u32 __iomap_read_end_io(struct bio *bio, int error)
  {
- 	int error = blk_status_to_errno(bio->bi_status);
  	struct folio_iter fi;
+ 	u32 folio_count = 0;
  
- 	bio_for_each_folio_all(fi, bio)
+ 	bio_for_each_folio_all(fi, bio) {
  		iomap_finish_folio_read(fi.folio, fi.offset, fi.length, error);
+ 		folio_count++;
+ 	}
+ 	if (bio_integrity(bio))
+ 		fs_bio_integrity_free(bio);
  	bio_put(bio);
+ 	return folio_count;
  }
  
 +static void
 +iomap_fail_reads(
 +	struct work_struct	*work)
 +{
 +	struct bio		*bio;
 +	struct bio_list		tmp = BIO_EMPTY_LIST;
 +	unsigned long		flags;
 +
 +	spin_lock_irqsave(&failed_read_lock, flags);
 +	bio_list_merge_init(&tmp, &failed_read_list);
 +	spin_unlock_irqrestore(&failed_read_lock, flags);
 +
 +	while ((bio = bio_list_pop(&tmp)) != NULL) {
- 		__iomap_read_end_io(bio);
++		__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
 +		cond_resched();
 +	}
 +}
 +
 +static DECLARE_WORK(failed_read_work, iomap_fail_reads);
 +
 +static void iomap_fail_buffered_read(struct bio *bio)
 +{
 +	unsigned long flags;
 +
 +	/*
 +	 * Bounce I/O errors to a workqueue to avoid nested i_lock acquisitions
 +	 * in the fserror code.  The caller no longer owns the bio reference
 +	 * after the spinlock drops.
 +	 */
 +	spin_lock_irqsave(&failed_read_lock, flags);
 +	if (bio_list_empty(&failed_read_list))
 +		WARN_ON_ONCE(!schedule_work(&failed_read_work));
 +	bio_list_add(&failed_read_list, bio);
 +	spin_unlock_irqrestore(&failed_read_lock, flags);
 +}
 +
  static void iomap_read_end_io(struct bio *bio)
  {
 -	__iomap_read_end_io(bio, blk_status_to_errno(bio->bi_status));
 +	if (bio->bi_status) {
 +		iomap_fail_buffered_read(bio);
 +		return;
 +	}
 +
- 	__iomap_read_end_io(bio);
++	__iomap_read_end_io(bio, 0);
  }
  
- static void iomap_bio_submit_read(struct iomap_read_folio_ctx *ctx)
++
+ u32 iomap_finish_ioend_buffered_read(struct iomap_ioend *ioend)
+ {
+ 	return __iomap_read_end_io(&ioend->io_bio, ioend->io_error);
+ }
+ 
+ static void iomap_bio_submit_read(const struct iomap_iter *iter,
+ 		struct iomap_read_folio_ctx *ctx)
  {
  	struct bio *bio = ctx->read_ctx;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

On Thu, Jun 20, 2024 at 12:34:17PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
> 
>   fs/open.c
> 
> between commit:

Sorry, the scripting got confused and didn't start the merge properly so
this should just be noise.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 849 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/open.c

between commit:

  7536b2f06724e ("VFS: generate FS_CREATE before FS_OPEN when ->atomic_open used.")

from the vfs-brauner-fixes tree and commit:

  7d1cf5e624ef5 ("vfs: generate FS_CREATE before FS_OPEN when ->atomic_open used.")

from the vfs-brauner tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc fs/open.c
index 58110f0bf5ac8,28f2fcbebb1ba..0000000000000
--- a/fs/open.c
+++ b/fs/open.c

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]