From: Qian Cai <cai@lca.pw>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org
Subject: Re: today's mmots tree is unusable
Date: Wed, 25 Sep 2019 11:41:36 -0400 [thread overview]
Message-ID: <1569426096.5576.223.camel@lca.pw> (raw)
In-Reply-To: <20190924194927.GB29030@cmpxchg.org>
On Tue, 2019-09-24 at 15:49 -0400, Johannes Weiner wrote:
> On Tue, Sep 24, 2019 at 09:09:38AM -0400, Qian Cai wrote:
> > https://github.com/hnaz/linux-mm
> >
> > FYI, lots of unresolved conflicts.
> >
> > # find ./ -type f | xargs grep -n '<<< HEAD'
> > ./Documentation/mips/index.rst:10:<<<<<<< HEAD
> > ./arch/mips/Kconfig:88:<<<<<<< HEAD
> > ./arch/mips/include/asm/pgtable-bits.h:55:<<<<<<< HEAD
> > ./arch/mips/include/asm/pgtable-bits.h:88:<<<<<<< HEAD
> > ./arch/mips/include/asm/pgtable-bits.h:107:<<<<<<< HEAD
> > ./arch/mips/include/asm/pgtable-bits.h:137:<<<<<<< HEAD
> > ./arch/mips/include/asm/pgtable-bits.h:166:<<<<<<< HEAD
> > ./arch/mips/mm/init.c:291:<<<<<<< HEAD
> > ./drivers/firmware/broadcom/bcm47xx_nvram.c:152:<<<<<<< HEAD
> > ./drivers/gpu/drm/amd/display/dc/dml/Makefile:47:<<<<<<< HEAD
> > ./drivers/md/dm-verity-verify-sig.c:39:<<<<<<< HEAD
> > ./drivers/nvdimm/pfn_devs.c:520:<<<<<<< HEAD
> > ./drivers/scsi/scsi_lib.c:1837:<<<<<<< HEAD
> > ./fs/f2fs/file.c:1736:<<<<<<< HEAD
> > ./fs/f2fs/inode.c:57:<<<<<<< HEAD
> > ./include/linux/export.h:21:<<<<<<< HEAD
> > ./include/linux/export.h:103:<<<<<<< HEAD
> > ./include/linux/export.h:184:<<<<<<< HEAD
> > ./init/Kconfig:2057:<<<<<<< HEAD
> > ./scripts/Makefile.modpost:98:<<<<<<< HEAD
> > ./scripts/link-vmlinux.sh:300:<<<<<<< HEAD
> > ./Makefile:1781:<<<<<<< HEAD
>
> This happens every once in a while when Andrew's base clashes with
> linux-next I believe. They come in verbatim from linux-next.patch -
> look for the markers in here:
> https://ozlabs.org/~akpm/mmots/broken-out/linux-next.patch
Does Andrew plan to fix those by himself soon or should we send a patch?
next prev parent reply other threads:[~2019-09-25 15:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-24 13:09 Qian Cai
2019-09-24 19:49 ` Johannes Weiner
2019-09-25 15:41 ` Qian Cai [this message]
2019-09-25 16:08 ` Andrew Morton
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=1569426096.5576.223.camel@lca.pw \
--to=cai@lca.pw \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
/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