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

Commit Message

Stephen Rothwell Oct. 31, 2023, 12:41 a.m. UTC

Hi all,

Today's linux-next merge of the xfs tree got conflicts in:

  fs/xfs/libxfs/xfs_rtbitmap.c
  fs/xfs/xfs_rtalloc.c

between commit:

  75d1e312bbbd ("xfs: convert to new timestamp accessors")

from Linus' tree and commit:

  41f33d82cfd3 ("xfs: consolidate realtime allocation arguments")
  a684c538bc14 ("xfs: convert xfs_extlen_t to xfs_rtxlen_t in the rt allocator")
  2d5f216b77e3 ("xfs: convert rt extent numbers to xfs_rtxnum_t")

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

Patch

diff --cc fs/xfs/libxfs/xfs_rtbitmap.c
index 396648acb5be,b332ab490a48..000000000000
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
diff --cc fs/xfs/xfs_rtalloc.c
index 2e1a4e5cd03d,ba66442910b1..000000000000
--- a/fs/xfs/xfs_rtalloc.c