Re: linux-next: manual merge of the vfs-brauner tree with the vfs-brauner-fixes tree
From: Mark Brown
Date: Thu Jun 20 2024 - 08:50:37 EST
On Thu, Jun 20, 2024 at 12:34:17PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/open.c
>
> between commit:
Sorry, the scripting got confused and didn't start the merge properly so
this should just be noise.
Attachment:
signature.asc
Description: PGP signature