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=-7.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 C06D1C432C2 for ; Wed, 25 Sep 2019 15:41:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7ECEF21D79 for ; Wed, 25 Sep 2019 15:41:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="BSPyn+IV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7ECEF21D79 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EC0306B0271; Wed, 25 Sep 2019 11:41:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E71796B0272; Wed, 25 Sep 2019 11:41:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D5F076B0273; Wed, 25 Sep 2019 11:41:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0024.hostedemail.com [216.40.44.24]) by kanga.kvack.org (Postfix) with ESMTP id AF1676B0271 for ; Wed, 25 Sep 2019 11:41:40 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 56A73181AC9BF for ; Wed, 25 Sep 2019 15:41:40 +0000 (UTC) X-FDA: 75973857960.25.girl81_e86289cd720f X-HE-Tag: girl81_e86289cd720f X-Filterd-Recvd-Size: 4628 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Wed, 25 Sep 2019 15:41:39 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id y189so5680830qkc.3 for ; Wed, 25 Sep 2019 08:41:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=message-id:subject:from:to:cc:date:in-reply-to:references :mime-version:content-transfer-encoding; bh=j5mX9upvkFZ9COd/sKUdttWBqzl1429HB5sZuy5ZBOs=; b=BSPyn+IVyWtZM/a5HFeNU8AGC7hz2Phl1QpRXMWfoVwIEgXGtgaLkTBfagcQzsBruX FF+MkPSV8rr7HnhGc0lmKqxzOgel9Hm6S5KE/CLmYz/HJwwLjI3sAx8p+cBugxK7UtIB rh/+nfGX2AJ7BpwrmrgvHecsK/JFYd1JmHJ+MkhnOzkB4fmF2lRGycEUBzAQICStzGAv zjIuRMaRR3w6PPwmEXYb7DGiwFYOzR7LEEZhGaviEcAaQkQRWo5WK3aAgj9FIcdUom6c M3Kxzn/BuPrm53cvCJRCooQxQAS/r49XKqJ/cKJl1vrpcDrXg4YPDOdjs6YzXfZUC7DZ WUzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:mime-version:content-transfer-encoding; bh=j5mX9upvkFZ9COd/sKUdttWBqzl1429HB5sZuy5ZBOs=; b=lSuF16yX+cTtsleI2m8JmSsvOGZ/WEUOi8T9x8d11/NCu1a9s1I0sSIdp/StcLmdaj rD4dN3oNXH9BU17//bdiUeMkbPY/KR+6OX6cFP6nhf1UsBAQB+Qo+ZfvBmAlioqgQad1 6Z8XUkdknM+Imo13upaIew1aqp76t7pIMKy70mzlb8MGsYnMTuFaCGg8N20/NSKbHdyo 5Fg1NvYvdGp2FGZDi5O/C4k23KAIeDi5YG5armbsLIGzHFLxePWpsuvAceG6xWNVF21q o03vDkuSB61uVdkcady6hPratQ2rwc/ajFnLmBIGFM2wimNQ9SBXELilfiNkVrat+kKT 3FtA== X-Gm-Message-State: APjAAAUgng+mB3wdMpoiXsi1XrV1jlOpaR+mycqPfPw0BXEGHqKrdRPR 2dn5Slz3J4HZdAnUGesgYR6F8OqlJ5Y= X-Google-Smtp-Source: APXvYqwY3cdzAiEsKF3nrTU11FwdxFjoLwCWdEOCCPSUyMgLKFq1s2NwBMMrejgSPn/yLFlNf0A4aQ== X-Received: by 2002:a37:410:: with SMTP id 16mr4249032qke.52.1569426098688; Wed, 25 Sep 2019 08:41:38 -0700 (PDT) Received: from dhcp-41-57.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id b192sm2942933qkg.39.2019.09.25.08.41.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Sep 2019 08:41:37 -0700 (PDT) Message-ID: <1569426096.5576.223.camel@lca.pw> Subject: Re: today's mmots tree is unusable From: Qian Cai To: Johannes Weiner Cc: Andrew Morton , linux-mm@kvack.org Date: Wed, 25 Sep 2019 11:41:36 -0400 In-Reply-To: <20190924194927.GB29030@cmpxchg.org> References: <1569330578.5576.214.camel@lca.pw> <20190924194927.GB29030@cmpxchg.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6 (3.22.6-10.el7) Mime-Version: 1.0 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 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'=C2=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 Does Andrew plan to fix those by himself soon or should we send a patch?