Subject: linux-next: manual merge of the ceph tree with the fscache tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 26 May 2022 10:46:50 +1000

Hi all,

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

  fs/ceph/caps.c

between commit:

  713423282ae1 ("netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context")

from the fscache tree and commit:

  3ffa9d6f991f ("ceph: replace usage of found with dedicated list iterator variable")

from the ceph 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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/ceph/caps.c
index a0467bca39fa,bf2e94005598..000000000000
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@@ -3181,11 -3202,10 +3202,10 @@@ void ceph_put_cap_refs_no_check_caps(st
  void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,
  				struct ceph_snap_context *snapc)
  {
 -	struct inode *inode = &ci->vfs_inode;
 +	struct inode *inode = &ci->netfs.inode;
- 	struct ceph_cap_snap *capsnap = NULL;
+ 	struct ceph_cap_snap *capsnap = NULL, *iter;
  	int put = 0;
  	bool last = false;
- 	bool found = false;
  	bool flush_snaps = false;
  	bool complete_capsnap = false;