Subject: Re: linux-next: manual merge of the vfs-brauner tree with the xfs tree

From: Chandan Babu R <[email-masked]>
Date: Tue, 27 Feb 2024 14:14:08 +0530

On Tue, Feb 27, 2024 at 10:28:27 AM +1100, Stephen Rothwell wrote:
> [[PGP Signed Part:No public key for 015042F34957D06C created at 2024-02-27T04:58:27+0530 using RSA]]
> Hi all,
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
>   fs/xfs/xfs_buf.c
>
> between commits:
>
>   d4c75a1b40cd ("xfs: convert remaining kmem_free() to kfree()")
>   5076a6040ca1 ("xfs: support in-memory buffer cache targets")
>
> from the xfs tree and commit:
>
>   1b9e2d90141c ("xfs: port block device access to files")
>
> from the vfs-brauner 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.

The resolution looks good to me. Thanks for fixing it up.

-- 
Chandan