diff mbox series

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

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

Commit Message

Stephen Rothwell Oct. 31, 2023, 12:18 a.m. UTC 
  Hi all,

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

  fs/btrfs/file.c
  fs/btrfs/inode.c
  fs/btrfs/transaction.c

between commit:

  b1c38a1338c9 ("btrfs: convert to new timestamp accessors")

from Linus' tree and commits:

  8b9d032225be ("btrfs: remove redundant root argument from btrfs_update_inode()")
  0a5d0dc55fcb ("btrfs: remove redundant root argument from btrfs_update_inode_fallback()")
  8b9d032225be ("btrfs: remove redundant root argument from btrfs_update_inode()")
  c6e8f898f56f ("btrfs: open code timespec64 in struct btrfs_inode")

from the btrfs 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/btrfs/file.c
index 278a4ea651e1,92419cb8508a..000000000000
--- a/fs/btrfs/file.c
diff --cc fs/btrfs/inode.c
index 6e3ce1aecb6e,b388505c91cc..000000000000
--- a/fs/btrfs/inode.c
diff --cc fs/btrfs/transaction.c
index 38a2775c5c7b,9694a3ca1739..000000000000
--- a/fs/btrfs/transaction.c