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=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 02D5BC4649B for ; Fri, 5 Jul 2019 15:47:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A32A821852 for ; Fri, 5 Jul 2019 15:47:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="WfGwnsre" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A32A821852 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 39C6A6B0006; Fri, 5 Jul 2019 11:47:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 325848E0003; Fri, 5 Jul 2019 11:47:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C63E8E0001; Fri, 5 Jul 2019 11:47:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by kanga.kvack.org (Postfix) with ESMTP id C28C66B0006 for ; Fri, 5 Jul 2019 11:47:20 -0400 (EDT) Received: by mail-wr1-f69.google.com with SMTP id q4so3971172wre.0 for ; Fri, 05 Jul 2019 08:47:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:thread-topic :thread-index:date:message-id:references:in-reply-to:accept-language :content-language:content-id:content-transfer-encoding:mime-version; bh=YxxJg4MIQ+kXyl/JgM+TzdLaXplemI/Hm2Vm6B9MMgg=; b=WsBfDvYTmFRPqnUT9dtNpg3hMlMboBM1e6TzEFFyptv7Q3N905p8uswkPbJz5Q5+PH n77/lN+30o+uBzEl53E6Z3j8Ja8d7iPNSOjs51cg3ncEKLY2ZxSuoSynQlExyzjcjEhA XNWFH5LfIUdcwo94EP9j60eerL9TU+TAiv1JAr7Klj5LvuoL3xF4NySesMaQtrJgo1Uy /MtfEVDNvELusCLq0Jt1WviuG5A6bhw9Ibb4A/6g/zMC7JxuZGxXh67YWQzEemHXo4iF q7brpiE2wSHDvL8uRjBwVQdoH2/u3jMhwocDc4VRgpXuD/tyUUha//mqkw669g2x+BLE RGFg== X-Gm-Message-State: APjAAAWTZbGpkzDQ9sWVtq8OPWmVLRlnoPeWip5zq3WNiD87gHKlyke5 mY69uA45Ss3puijuI2rw0mD5QqZc3SaUxDZ/wdrIm/DUCkJD7VRBER45tZDaaYPTw2AaHtzYkOR sbVD09S+NIgfGB2htPnKsy4wWrZOxSTrsSx2CwTUxrTL6jOsgj6obt656aEwBpcxVgQ== X-Received: by 2002:a50:8eea:: with SMTP id x39mr5275786edx.49.1562341640252; Fri, 05 Jul 2019 08:47:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqztH1evZjDbP8/riPvRP/4fNRKxlDVv0Nq4s/6J3VSiEreRSE49cZYrIYU6xfPNtTrWxhfc X-Received: by 2002:a50:8eea:: with SMTP id x39mr5275712edx.49.1562341639271; Fri, 05 Jul 2019 08:47:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562341639; cv=none; d=google.com; s=arc-20160816; b=CH1+4OMzCbi32xfhKeTS/5t6WnqutLHRs6Vh3s3ArrChKJeV/WKv7Ryb9Q8p2GdplF rK7Wb3zNjPbcN7n1KLXNM0AsOPO0BE+HEIqu4y+mpK39gvyiKTbRPq0/CzuvQvPCaHOs hJPLJfb/YUvnH+PdpcbFBHMqmkAVcoDKrWAXP9kLti50EgcXRgHGL7kTYSotaRWQxe7J 1ErBStrKRlxy+pPKb32DI1OenmjlUMaghs0iuHvI0lfDHch7LzRggEE0Us+0vUeAG53v B7prxRFV+Y/sLcQDINISaaWLuYig/7NoCLXaEeYtJLh5xf685f5BFTxN3LM1MBco/eVY EizQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-id:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature; bh=YxxJg4MIQ+kXyl/JgM+TzdLaXplemI/Hm2Vm6B9MMgg=; b=u/QWL2ZPbQ8U15GZqotkFYE5oKcQXD+n2EgS4homrS2l5zc7da1ywlSO8UW5rVQzRf Zpdabf6U2wynBZeo0VQR9Z98zTA9AptGK5DlgiVoKxRYfTlXr0FU7OD+R7uXkIaqrcu/ oiMl3lsFCrgO60qC81wjlgX/drlNHJvdcS5g2cRH5DRn+6Qzn8cx9v/iViR7SwtKuLvH Y+D+ozhSZREF9Iruh+QmVfiNbZWtLqOkVK1DpkvRQpFEp9ycrFFmrjP1uqJ7mzki/+P9 iu86boHf92zo7MiXLy3hezcywwXOLZT4/lmyunE1YU6ZQR02xesUzAXNF1Rfcf7nDO6D 3eBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@Mellanox.com header.s=selector2 header.b=WfGwnsre; spf=pass (google.com: domain of jgg@mellanox.com designates 40.107.2.87 as permitted sender) smtp.mailfrom=jgg@mellanox.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mellanox.com Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20087.outbound.protection.outlook.com. [40.107.2.87]) by mx.google.com with ESMTPS id f30si7707315edf.183.2019.07.05.08.47.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jul 2019 08:47:19 -0700 (PDT) Received-SPF: pass (google.com: domain of jgg@mellanox.com designates 40.107.2.87 as permitted sender) client-ip=40.107.2.87; Authentication-Results: mx.google.com; dkim=pass header.i=@Mellanox.com header.s=selector2 header.b=WfGwnsre; spf=pass (google.com: domain of jgg@mellanox.com designates 40.107.2.87 as permitted sender) smtp.mailfrom=jgg@mellanox.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mellanox.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YxxJg4MIQ+kXyl/JgM+TzdLaXplemI/Hm2Vm6B9MMgg=; b=WfGwnsreFN2W6n4FYF56NOwkTFfhAVZd+oWsfT5Qq2/xWDoyXSG3m+py4VJ3TcOdHOcJHwUv4hA4GBgEVO6Ciu7ih4RDE4H9GDsJUw5ttiwWJzNJae1wQW/xh8uGJzID3UaGRWgzybPvPq4H4HHXn6k+WvHp6Xj476t+7h80V1o= Received: from VI1PR05MB4141.eurprd05.prod.outlook.com (10.171.182.144) by VI1PR05MB4157.eurprd05.prod.outlook.com (10.171.182.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2032.20; Fri, 5 Jul 2019 15:47:17 +0000 Received: from VI1PR05MB4141.eurprd05.prod.outlook.com ([fe80::f5d8:df9:731:682e]) by VI1PR05MB4141.eurprd05.prod.outlook.com ([fe80::f5d8:df9:731:682e%5]) with mapi id 15.20.2052.019; Fri, 5 Jul 2019 15:47:17 +0000 From: Jason Gunthorpe To: Andrew Morton CC: Christoph Hellwig , Mark Rutland , Robin Murphy , "linux-mm@kvack.org" , "will.deacon@arm.com" , "catalin.marinas@arm.com" , "anshuman.khandual@arm.com" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Michal Hocko , Dan Williams Subject: Re: [PATCH v3 0/4] Devmap cleanups + arm64 support Thread-Topic: [PATCH v3 0/4] Devmap cleanups + arm64 support Thread-Index: AQHVK/HAM2r3dJ5EjUuvQfApLyHQmKat3lEAgAA0MoCAAAH5AIAAxnaAgAwArgCAABJ8AIAADxQAgAAJ3QCAATLjgA== Date: Fri, 5 Jul 2019 15:47:16 +0000 Message-ID: <20190705154713.GF31525@mellanox.com> References: <20190626073533.GA24199@infradead.org> <20190626123139.GB20635@lakrids.cambridge.arm.com> <20190626153829.GA22138@infradead.org> <20190626154532.GA3088@mellanox.com> <20190626203551.4612e12be27be3458801703b@linux-foundation.org> <20190704115324.c9780d01ef6938ab41403bf9@linux-foundation.org> <20190704195934.GA23542@mellanox.com> <20190704135332.234891ac6ce641bf29913d06@linux-foundation.org> <20190704212850.GB23542@mellanox.com> In-Reply-To: <20190704212850.GB23542@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BL0PR0102CA0037.prod.exchangelabs.com (2603:10b6:208:25::14) To VI1PR05MB4141.eurprd05.prod.outlook.com (2603:10a6:803:4d::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [156.34.55.100] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: bae908f3-8803-4511-a3c6-08d701600e6a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:VI1PR05MB4157; x-ms-traffictypediagnostic: VI1PR05MB4157: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-forefront-prvs: 008960E8EC x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(396003)(136003)(346002)(39860400002)(366004)(189003)(199004)(66446008)(66556008)(64756008)(66476007)(66946007)(73956011)(6246003)(68736007)(36756003)(53936002)(71190400001)(71200400001)(6436002)(14444005)(256004)(11346002)(476003)(2616005)(6512007)(1076003)(5660300002)(446003)(86362001)(486006)(54906003)(386003)(7416002)(81156014)(25786009)(3846002)(6116002)(102836004)(6916009)(8676002)(14454004)(33656002)(99286004)(76176011)(229853002)(66066001)(6486002)(52116002)(6506007)(2906002)(4326008)(305945005)(316002)(81166006)(8936002)(26005)(478600001)(7736002)(186003);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR05MB4157;H:VI1PR05MB4141.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0/6Z+Bfs/UvVgFelpooJC+yb5+DJ55uzjAsttdFZPI8cmBLjPsYzungODysy6hjpr18R6P/3meVc8KOhdZPgJQuMVBtFQhczTA7Wdw7H4ZRKu/96B68qJD0sh0DxxBqfEeWFvkJxTJJqFKvuDMKq0wjmLja3Vm+NJ7Ouxioy3/qDjdAxJdeTQYdXC2AlwmlMXWSGB4LnDfjhwQJpmqu9KjANmkqfmxLRUwhcbufFnCWYtpUD8UXRCOIVr4szwSklgvYs1PDp6uv6Uq/qSgcPzFrFVjm007CKBefMP70suVIsSGomXML1Mb1DTvgLDHBx4NtifsL0MerLiwoBZV7m6p2ERH9Onfx+XqZ2kLG0IaW5wP9fW/iRteoSGvBkdwXs/cinq6QhFaVAiZjbVBjukBjNIY3mcqMGq/JE8lwioio= Content-Type: text/plain; charset="us-ascii" Content-ID: <447BAA9C69B30443BF5B2CEE61EC6F33@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: bae908f3-8803-4511-a3c6-08d701600e6a X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jul 2019 15:47:16.9430 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: jgg@mellanox.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4157 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 Thu, Jul 04, 2019 at 06:28:50PM -0300, Jason Gunthorpe wrote: > > It's a large patchset and it appears to be mainly (entirely?) code > > cleanups. I don't think such material would be appropriate for a late > > -rc7 merge even if it didn't conflict with lots of other higher > > priority pending functional changes and fixes! >=20 > I see your other email you resolved the conflicts - so please let me > know if you want to proceed with dropping CH's series or not, I'll > make a special effort to get that change into tomorrows linux-next if > you want (it is already 6pm here) I spent some time this morning looking at the various conflicts, and I think Dan is right, they are mangable. In the sense we can forward a merge resolution to Linus and it is not completely crazy. Most hunks are the usual mechanical sort of conflicts. Like Stephen, only two small conflict hunks in the memremap.c give me any pause, and I'm confident with CH and Dan's help it can be resolved robustly. If Linus doesn't like it then we fall back to dropping CH's series. So, here is a fourth idea.. We remove hmm.git entirely from your workflow (ie you revert commit "cc5dfd59e375f Merge branch 'hmm-devmem-cleanup.4' into rdma.git hmm" in your local version of linux-next) and I will send hmm.git to Linus after Dan's patches and others are merged by you to Linus. With Dan and CH's help I will forward the reviewed conflict resolution. This will not disturb the -mm patch workflow at all, and you can put everything back the way it was on July 3. What do you think about this? Jason