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] [day] [month] [year] [list]

Message-Id: <20190717145834.1cb98d9987a63602a441f136@linux-foundation.org>
Date:   Wed, 17 Jul 2019 14:58:34 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Randy Dunlap <rdunlap@...radead.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>, 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 Wed, 17 Jul 2019 07:55:57 -0700 Randy Dunlap <rdunlap@...radead.org> wrote:

> 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 forgot to fix all those :(

iirc they're usually caused by people merging a patch into mainline
which differs from the version they had in -next.