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,URIBL_BLOCKED,USER_AGENT_SANE_1 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 CA2C1C432C1 for ; Tue, 24 Sep 2019 19:49:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 633502146E for ; Tue, 24 Sep 2019 19:49:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="P6+JZrko" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 633502146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 125C46B000A; Tue, 24 Sep 2019 15:49:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D6636B000C; Tue, 24 Sep 2019 15:49:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 013416B000D; Tue, 24 Sep 2019 15:49:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0205.hostedemail.com [216.40.44.205]) by kanga.kvack.org (Postfix) with ESMTP id D31C66B000A for ; Tue, 24 Sep 2019 15:49:30 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 76E1B180AD802 for ; Tue, 24 Sep 2019 19:49:30 +0000 (UTC) X-FDA: 75970853700.12.bikes85_52eb6a658b643 X-HE-Tag: bikes85_52eb6a658b643 X-Filterd-Recvd-Size: 4493 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Tue, 24 Sep 2019 19:49:29 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id x5so3643760qtr.7 for ; Tue, 24 Sep 2019 12:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=YrMRvioOCWKzt2yDwa18Ec/Fwg319fnYPaVvbJcbxFc=; b=P6+JZrkoyyBjGKaQEr45fIGdn9rCFkSNJNjolApojQkP7IM6vnRPkdejX5AwEuTuNq DkDfwIyqLLLtEx6u9YKDLbwl7/8HpB62c6ZAGmK3QyrS9ec7nV6TEVJktgUVYTMSesyA /hUkiOEqaAJKJSIumrdJFW8wPiKRcTgNCuLCb+/aXqxVWKw0UdcNel5393XUbnfBYeii T7+nxwpl8xi0rchWWOBK7tkbmm0BK8yPrYQD0rfkKd79+UsdJv4h6z5O2xsqvLG7Pg8l IfJt2uskqEChkJbRCtK/wfcUFKySv7I8AozVa7nZU/4d36UTXcKsGYD1OSP/ZkaimcUP xuDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=YrMRvioOCWKzt2yDwa18Ec/Fwg319fnYPaVvbJcbxFc=; b=g0R3k3fM5G3F74PLE5XL16KG0zNqJSW4yEjMmFzDzbSQwAua2TcV0xr7a5ircCvz8u TNytSThht3TMbbQRpbw5wgcFfYOhajuoD7bhQpbJoHj6mM+MRKKC1QQKZ1q8zc5rDMiF LucPIiu/GQhDbSOlDJrMYdAFxySurX1sxRGsgrfsiUqGNnCNoSFUEcXXtMUu31STUS2x jyrcZKhxjy4SJSy5qqFUTx0mWxcqRshs0FauidSpQ89g4AdHmV+CJW37kUKmp5OBbPzN +TZuegarkOAnH06tKumCDq3Pn8DfMBcBGBdRR4BTrpVT5+zXsL8nC5x0H90rIaWoS8pH 7CXg== X-Gm-Message-State: APjAAAXZjOC4NHEwciWeVJlEng/ukvM1URRpIvPHTuM1tJH4/phggYvG X9Hs/z2sbH/grYooN06z9DbN9947xB8= X-Google-Smtp-Source: APXvYqzbiU1sVEOUW9chACbj4YUte+5fClczMbat1hs1ZjLcYU1FG86AuGSUjvY1zFjoL+IjNfGoMA== X-Received: by 2002:ac8:1935:: with SMTP id t50mr4533023qtj.214.1569354569062; Tue, 24 Sep 2019 12:49:29 -0700 (PDT) Received: from localhost ([2620:10d:c091:500::a51]) by smtp.gmail.com with ESMTPSA id u17sm1315091qkj.71.2019.09.24.12.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 12:49:28 -0700 (PDT) Date: Tue, 24 Sep 2019 15:49:27 -0400 From: Johannes Weiner To: Qian Cai Cc: Andrew Morton , linux-mm@kvack.org Subject: Re: today's mmots tree is unusable Message-ID: <20190924194927.GB29030@cmpxchg.org> References: <1569330578.5576.214.camel@lca.pw> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1569330578.5576.214.camel@lca.pw> User-Agent: Mutt/1.12.1 (2019-06-15) Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000072, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 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