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

[Stephen Rothwell]

Hi Randy,

On Tue, 16 Jul 2019 23:21:48 -0700 Randy Dunlap <rdunlap@xxxxxxxxxxxxx> 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

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.
-- 
Cheers,
Stephen Rothwell

Attachment: pgpcyf3TaSmzp.pgp
Description: OpenPGP digital signature