linux-next: manual merge of the ceph tree with the origin tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

FIXME: Add author(s)/SOB of conflicting commits.

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

  fs/ceph/addr.c

between commit:

  6d1a85b306729 ("ceph: replace PagePrivate() with page_private()")

from the origin tree and commit:

  81a949790a690 ("ceph: add ceph_folio_snap_context()")

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.

diff --cc fs/ceph/addr.c
index 21d52d8498424,259e317981558..0000000000000
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@@ -65,12 -65,13 +65,13 @@@
  	(CONGESTION_ON_THRESH(congestion_kb) -				\
  	 (CONGESTION_ON_THRESH(congestion_kb) >> 2))
  
 -static int ceph_netfs_check_write_begin(struct file *file, loff_t pos, unsigned int len,
 +static int ceph_netfs_check_write_begin(struct file *file, uoff_t pos, unsigned int len,
  					struct folio **foliop, void **_fsdata);
  
- static inline struct ceph_snap_context *page_snap_context(struct page *page)
+ static inline
+ struct ceph_snap_context *ceph_folio_snap_context(const struct folio *folio)
  {
- 	return (void *)page_private(page);
+ 	return folio->private;
  }
  
  /*

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