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

[Shuah Khan]

On 8/24/23 02:52, Christian Brauner wrote:
> > Anyways Linus should also be able to resolve the conflict for v6.6 with
> > a small hint in the PR.
>
> Suprisingly, we've done this before. :)

Right. This is how resolve these types of merge conflicts. I will add
note to Linus about this one.

thanks,
-- Shuah