diff mbox series

linux-next: manual merge of the btrfs tree with the mm tree

Message ID 20230926101717.0237a18a@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the btrfs tree with the mm tree |

Commit Message

Stephen Rothwell Sept. 26, 2023, 12:17 a.m. UTC 
  Hi all,

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

  fs/btrfs/super.c

between commit:

  a95330e8e416 ("fs: super: dynamically allocate the s_shrink")

from the mm tree and commit:

  dd99b78be273 ("btrfs: open block devices after superblock creation")

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/super.c
index b1798bed68f2,c41ed5a78ea4..000000000000
--- a/fs/btrfs/super.c