On Wed, 25 Sep 2019 11:41:36 -0400 Qian Cai <cai@xxxxxx> 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.
