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

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 linux-cve-announce 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]

Message-ID: <20201215153751.5150e00a@canb.auug.org.au>
Date:   Tue, 15 Dec 2020 15:37:51 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Christian Brauner <christian.brauner@...ntu.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Some fixes for v5.11

Hi Linus,

On Mon, 14 Dec 2020 16:45:50 -0800 Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
> 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..

The time namespace changes appear in linux-next for the first time
today - where I reported that 3 of them have no Signed-off-by from their
committer :-(.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped