lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Mon, 14 Dec 2020 16:45:50 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Christian Brauner <christian.brauner@...ntu.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Some fixes for v5.11

On Mon, Dec 14, 2020 at 5:27 AM Christian Brauner
<christian.brauner@...ntu.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

Powered by blists - more mailing lists