From: Andrew Morton <akpm@linux-foundation.org>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
broonie@kernel.org, mhocko@suse.cz, linux-next@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org
Subject: Re: mmotm 2019-07-16-17-14 uploaded
Date: Wed, 17 Jul 2019 14:58:34 -0700 [thread overview]
Message-ID: <20190717145834.1cb98d9987a63602a441f136@linux-foundation.org> (raw)
In-Reply-To: <a1179bac-204d-110e-327f-845e9b09a7ab@infradead.org>
On Wed, 17 Jul 2019 07:55:57 -0700 Randy Dunlap <rdunlap@infradead.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@infradead.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.
prev parent reply other threads:[~2019-07-17 21:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 0:15 akpm
2019-07-17 3:50 ` Randy Dunlap
2019-07-17 3:54 ` Randy Dunlap
2019-07-17 4:38 ` Stephen Rothwell
2019-07-17 6:19 ` Randy Dunlap
2019-07-17 6:21 ` Randy Dunlap
2019-07-17 8:04 ` Stephen Rothwell
2019-07-17 14:55 ` Randy Dunlap
2019-07-17 21:58 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190717145834.1cb98d9987a63602a441f136@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mm-commits@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox