diff mbox series

linux-next: manual merge of the ceph tree with Linus' tree

Message ID 20231106092408.24ea682e@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the ceph tree with Linus' tree |

Commit Message

Stephen Rothwell Nov. 5, 2023, 10:24 p.m. UTC 
  Hi all,

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

  fs/ceph/inode.c

between commit:

  c453bdb53534 ("ceph: convert to new timestamp accessors")

from Linus' tree and commit:

  38d46409c463 ("ceph: print cluster fsid and client global_id in all debug logs")

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 mbox series

Patch

diff --cc fs/ceph/inode.c
index 2e2a303b9e64,b1b92a948a3b..000000000000
--- a/fs/ceph/inode.c