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 B79F8C432C1 for ; Tue, 24 Sep 2019 13:09:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 521482146E for ; Tue, 24 Sep 2019 13:09:44 +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="Las6GMNa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 521482146E 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 CFF9C6B0005; Tue, 24 Sep 2019 09:09:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB0A56B000A; Tue, 24 Sep 2019 09:09:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC5CF6B000C; Tue, 24 Sep 2019 09:09:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0166.hostedemail.com [216.40.44.166]) by kanga.kvack.org (Postfix) with ESMTP id 9E25A6B0005 for ; Tue, 24 Sep 2019 09:09:43 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id E7881180AD802 for ; Tue, 24 Sep 2019 13:09:42 +0000 (UTC) X-FDA: 75969846204.25.cub13_54bb45f972737 X-HE-Tag: cub13_54bb45f972737 X-Filterd-Recvd-Size: 3915 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Tue, 24 Sep 2019 13:09:42 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id u8so4237857iom.5 for ; Tue, 24 Sep 2019 06:09:41 -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:mime-version :content-transfer-encoding; bh=CDK6/MAfEuOnMxMGCfp6Ar7scDSwWkJ1qMXtVAE4IoM=; b=Las6GMNaoavEtvw72kVap7eMTOCLsoy1JKCBLZBPM+OsiU4QYn629nGQqvKEuUV/3q mq0SZNy0VpfW5o5UvBFpHrzjhZjBnufUgblni46NiIFQBDcMsQ54/umlc+YO4GoYgtqz IVkHarzxDS/BPDGOT0o+J9Tf04NpAS/1Lx4mlB+rYzxpmU/7u71/V5eOzL6DlO5MO5F+ GL4PXuh0tvHuN0fbysEP+9h8j0ebHEpKNSXmLqK40XT/ERmhnJUz9NVD5u153uYXQQjJ kv0dMQzK7jgDkzV8P91DsUOBLwTWCxyWJhF9dYLny9yOLfaqNVua3E4GCVfP1fPBTzdw ThMw== 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:mime-version :content-transfer-encoding; bh=CDK6/MAfEuOnMxMGCfp6Ar7scDSwWkJ1qMXtVAE4IoM=; b=l5dO5NgsVo7oLseDEzSRoJHCSRehyaIqKnu7mNriXCe6J9M7GyPZ6uJOvDmhjdLCMI UdSlWJt9Jz1HiCqbMvOcgxxPqVK5fGMvucDwUyuYHjLnU1yzpn2PB14mZrGuE0TZuXsf 4IiMHFfQRn6ZE2tU3bPByHPGuwz9Uun8HfgJoioDHWR6VpJSaAMAYynBT4XfHVwKnDde bhR8x8glfaAFkcic3/DhZu/P0wBNF0z+Jd+JXEn9VhsGGkWp9c4wN1e1jyYE96A2WF2d 2odOUo3gC1UL06DKUbJ4k+nwtoWHRsYqs3aCwxbyfdCQTBVqYjN9n8KQXeSFdGwffHbh NXqQ== X-Gm-Message-State: APjAAAVMEC4WLLiYi0IAnrQmE5OX2YKpOVxu5M2yH+TddtyP3qZVr9qG 2JWWzimi74LK9fyrg7vnLpwqll3xMxs= X-Google-Smtp-Source: APXvYqz/QEFo/rvqtpDeDHrnyrkikYC6nESPlhKkzuCd+8i997TxHnUZbnwnQxOzn9ECRgvlSi6lew== X-Received: by 2002:a37:2746:: with SMTP id n67mr2392711qkn.368.1569330580512; Tue, 24 Sep 2019 06:09:40 -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 w2sm1094199qtc.59.2019.09.24.06.09.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Sep 2019 06:09:39 -0700 (PDT) Message-ID: <1569330578.5576.214.camel@lca.pw> Subject: today's mmots tree is unusable From: Qian Cai To: Andrew Morton , Johannes Weiner Cc: linux-mm@kvack.org Date: Tue, 24 Sep 2019 09:09:38 -0400 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: https://github.com/hnaz/linux-mm FYI, lots of unresolved conflicts. # 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