Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 22:29:34 +0000 (09:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 22:29:34 +0000 (09:29 +1100)
commit42520392f692db3f3d6402848afd44c55595c45c
tree720cb4836f3cf79ae9d89e708ddb6c20fef73870
parenta13a2374f0cedaa84a39ad405b9c6ec6c12577a3
parentb3bb9413e717b44e4aea833d07f14e90fb91cf97
Merge branch 'for-next' of git://git./fs/xfs/xfs-linux.git

# Conflicts:
# fs/xfs/xfs_ioctl.c
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_file.c