* today's mmots tree is unusable
@ 2019-09-24 13:09 Qian Cai
2019-09-24 19:49 ` Johannes Weiner
0 siblings, 1 reply; 4+ messages in thread
From: Qian Cai @ 2019-09-24 13:09 UTC (permalink / raw)
To: Andrew Morton, Johannes Weiner; +Cc: linux-mm
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: today's mmots tree is unusable
2019-09-24 13:09 today's mmots tree is unusable Qian Cai
@ 2019-09-24 19:49 ` Johannes Weiner
2019-09-25 15:41 ` Qian Cai
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Weiner @ 2019-09-24 19:49 UTC (permalink / raw)
To: Qian Cai; +Cc: Andrew Morton, linux-mm
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: today's mmots tree is unusable
2019-09-24 19:49 ` Johannes Weiner
@ 2019-09-25 15:41 ` Qian Cai
2019-09-25 16:08 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Qian Cai @ 2019-09-25 15:41 UTC (permalink / raw)
To: Johannes Weiner; +Cc: Andrew Morton, linux-mm
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?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: today's mmots tree is unusable
2019-09-25 15:41 ` Qian Cai
@ 2019-09-25 16:08 ` Andrew Morton
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2019-09-25 16:08 UTC (permalink / raw)
To: Qian Cai; +Cc: Johannes Weiner, linux-mm
On Wed, 25 Sep 2019 11:41:36 -0400 Qian Cai <cai@lca.pw> wrote:
> 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?
I'll fix it next time. I believe these are caused by people sending
material to Linus which differs from what they have in linux-next. A
ton of this happens during the merge window so I often just don't
bother fixing it all up.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-25 16:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-24 13:09 today's mmots tree is unusable Qian Cai
2019-09-24 19:49 ` Johannes Weiner
2019-09-25 15:41 ` Qian Cai
2019-09-25 16:08 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).