Received-SPF: pass (google.com: domain of linux-kernel+bounces-82878-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
References: <20240227102827.313113cd@canb.auug.org.au>
User-agent: mu4e 1.10.8; emacs 27.1
From: Chandan Babu R <chandanbabu@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Brauner <brauner@kernel.org>, "Darrick J. Wong"
 <djwong@kernel.org>, David Chinner <david@fromorbit.com>,
 linux-xfs@vger.kernel.org, Dave Chinner <dchinner@redhat.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing
 List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the xfs tree
Date: Tue, 27 Feb 2024 14:14:08 +0530
In-reply-to: <20240227102827.313113cd@canb.auug.org.au>
Message-ID: <878r36l2iz.fsf@debian-BULLSEYE-live-builder-AMD64>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain

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