diff mbox series

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

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

Commit Message

Stephen Rothwell Jan. 10, 2024, 11:03 p.m. UTC 
  Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  fs/btrfs/extent_io.c

between commits:

  affc5af36bbb ("Merge tag 'for-6.8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux")
  600f111ef51d ("fs: Rename mapping private members")

from Linus' tree and commit:

  08236d11031b ("btrfs: cache folio size and shift in extent_buffer")

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/extent_io.c
index cfd2967f04a2,c8aabe3be169..000000000000
--- a/fs/btrfs/extent_io.c