lkml.org 
[lkml]   [2020]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [GIT PULL] Some fixes for v5.11
On Mon, Dec 14, 2020 at 5:27 AM Christian Brauner
<christian.brauner@ubuntu.com> 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

\
 
 \ /
  Last update: 2020-12-15 01:48    [W:0.050 / U:0.648 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site