On 7/17/19 1:04 AM, Stephen Rothwell wrote: > 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 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
