From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EAC6C432C2 for ; Wed, 25 Sep 2019 16:08:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D67532146E for ; Wed, 25 Sep 2019 16:08:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="1uMBq6EI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D67532146E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 647E76B0273; Wed, 25 Sep 2019 12:08:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F7776B0274; Wed, 25 Sep 2019 12:08:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50BC66B0275; Wed, 25 Sep 2019 12:08:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0238.hostedemail.com [216.40.44.238]) by kanga.kvack.org (Postfix) with ESMTP id 29CF46B0273 for ; Wed, 25 Sep 2019 12:08:39 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id B14B54821 for ; Wed, 25 Sep 2019 16:08:38 +0000 (UTC) X-FDA: 75973925916.16.night01_688543a86c74e X-HE-Tag: night01_688543a86c74e X-Filterd-Recvd-Size: 3595 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Sep 2019 16:08:38 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F29622146E; Wed, 25 Sep 2019 16:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569427717; bh=7P6qw2REZQHdk0v9wQxTYuSfnjeWexjL7a92+MN8kTA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=1uMBq6EI7+BAKhrPwhc6zNGLe2NTDv0iqZLiLChx13wb8l8y1uTVX1TyzFX/Nsxrg oMePxZbcF4VHcW1QwhLpeozjwyPzCW1cBl4E/vYxQYjuXcVM0nbmaOIXiMrcuQb34D 2tbqQS4rhP+W2V8RPqkGwnlM9m3wEKMgvW9bk+8s= Date: Wed, 25 Sep 2019 09:08:36 -0700 From: Andrew Morton To: Qian Cai Cc: Johannes Weiner , linux-mm@kvack.org Subject: Re: today's mmots tree is unusable Message-Id: <20190925090836.ddb7ba4d889dee8226bbafff@linux-foundation.org> In-Reply-To: <1569426096.5576.223.camel@lca.pw> References: <1569330578.5576.214.camel@lca.pw> <20190924194927.GB29030@cmpxchg.org> <1569426096.5576.223.camel@lca.pw> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, 25 Sep 2019 11:41:36 -0400 Qian Cai 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 > > >=20 > > > FYI, lots of unresolved conflicts. > > >=20 > > > # find ./ -type f | xargs grep -n '<<< HEAD'=A0 > > > ./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 > >=20 > > 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 >=20 > 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.