Re: [GIT PULL] Some fixes for v5.11

[Linus Torvalds]

On Mon, Dec 14, 2020 at 5:27 AM Christian Brauner
<christian.brauner@xxxxxxxxxx> wrote:
>
> /* Conflicts */
> At the time of creating this PR no merge conflicts were reported from
> linux-next and no merge conflict with 2c85ebc57b3e ("Linux 5.10") when
> pulling the tag.

Really? It conflicted with your own time namespace fixes.. Was one or
the other not in linux-next?

Not that the conflicts were big or bad (free_time_ns() prototype
changed right next to timens_on_fork() prototype), I'm just surprised
you saw no conflicts..

It may be that Stephen didn't even bother reporting them as trivial.

               Linus