linux-kernel - Re: mmotm 2019-07-16-17-14 uploaded

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: <a1179bac-204d-110e-327f-845e9b09a7ab@infradead.org>
Date:   Wed, 17 Jul 2019 07:55:57 -0700
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     akpm@...ux-foundation.org, broonie@...nel.org, mhocko@...e.cz,
        linux-next@...r.kernel.org, linux-fsdevel@...r.kernel.org,
        linux-mm@...ck.org, linux-kernel@...r.kernel.org,
        mm-commits@...r.kernel.org
Subject: Re: mmotm 2019-07-16-17-14 uploaded

On 7/17/19 1:04 AM, Stephen Rothwell wrote:
> Hi Randy,
> 
> On Tue, 16 Jul 2019 23:21:48 -0700 Randy Dunlap <rdunlap@...radead.org> wrote:
>>
>> drivers/dma-buf/dma-buf.c:
>> <<<<<<< HEAD
>> =======
>> #include <linux/pseudo_fs.h>
>>>>>>>>> linux-next/akpm-base  
> 
> I can't imagine what went wrong, but you can stop now :-)
> 
> $ grep '<<< HEAD' linux-next.patch | wc -l
> 1473

Yes, I did the grep also, decided to give up.

> I must try to find the emails where Andrew and I discussed the
> methodology used to produce the linux-next.patch from a previous
> linux-next tree.



-- 
~Randy