From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-Version: 1.0 References: <20190617122733.22432-1-hch@lst.de> <20190619094032.GA8928@lst.de> <20190619163655.GG9360@ziepe.ca> In-Reply-To: <20190619163655.GG9360@ziepe.ca> From: Dan Williams Date: Wed, 19 Jun 2019 09:46:23 -0700 Message-ID: Subject: Re: dev_pagemap related cleanups v2 Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org To: Jason Gunthorpe Cc: Christoph Hellwig , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Ben Skeggs , Linux MM , nouveau@lists.freedesktop.org, Maling list - DRI developers , linux-nvdimm , linux-pci@vger.kernel.org, Linux Kernel Mailing List List-ID: On Wed, Jun 19, 2019 at 9:37 AM Jason Gunthorpe wrote: > > On Wed, Jun 19, 2019 at 11:40:32AM +0200, Christoph Hellwig wrote: > > On Tue, Jun 18, 2019 at 12:47:10PM -0700, Dan Williams wrote: > > > > Git tree: > > > > > > > > git://git.infradead.org/users/hch/misc.git hmm-devmem-cleanup.2 > > > > > > > > Gitweb: > > > > > > > > http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/hmm-devmem-cleanup.2 > > > > > > > > Attached is my incremental fixups on top of this series, with those > > > integrated you can add: > > > > I've folded your incremental bits in and pushed out a new > > hmm-devmem-cleanup.3 to the repo above. Let me know if I didn't mess > > up anything else. I'll wait for a few more comments and Jason's > > planned rebase of the hmm branch before reposting. > > I said I wouldn't rebase the hmm.git (as it needs to go to DRM, AMD > and RDMA git trees).. > > Instead I will merge v5.2-rc5 to the tree before applying this series. > > I've understood this to be Linus's prefered workflow. > > So, please send the next iteration of this against either > plainv5.2-rc5 or v5.2-rc5 merged with hmm.git and I'll sort it out. Just make sure that when you backmerge v5.2-rc5 you have a clear reason in the merge commit message about why you needed to do it. While needless rebasing is top of the pet peeve list, second place, as I found out, is mystery merges without explanations. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Williams Subject: Re: dev_pagemap related cleanups v2 Date: Wed, 19 Jun 2019 09:46:23 -0700 Message-ID: References: <20190617122733.22432-1-hch@lst.de> <20190619094032.GA8928@lst.de> <20190619163655.GG9360@ziepe.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190619163655.GG9360@ziepe.ca> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jason Gunthorpe Cc: linux-nvdimm , nouveau@lists.freedesktop.org, Linux Kernel Mailing List , Maling list - DRI developers , Linux MM , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Ben Skeggs , linux-pci@vger.kernel.org, Christoph Hellwig List-Id: nouveau.vger.kernel.org T24gV2VkLCBKdW4gMTksIDIwMTkgYXQgOTozNyBBTSBKYXNvbiBHdW50aG9ycGUgPGpnZ0B6aWVw ZS5jYT4gd3JvdGU6Cj4KPiBPbiBXZWQsIEp1biAxOSwgMjAxOSBhdCAxMTo0MDozMkFNICswMjAw LCBDaHJpc3RvcGggSGVsbHdpZyB3cm90ZToKPiA+IE9uIFR1ZSwgSnVuIDE4LCAyMDE5IGF0IDEy OjQ3OjEwUE0gLTA3MDAsIERhbiBXaWxsaWFtcyB3cm90ZToKPiA+ID4gPiBHaXQgdHJlZToKPiA+ ID4gPgo+ID4gPiA+ICAgICBnaXQ6Ly9naXQuaW5mcmFkZWFkLm9yZy91c2Vycy9oY2gvbWlzYy5n aXQgaG1tLWRldm1lbS1jbGVhbnVwLjIKPiA+ID4gPgo+ID4gPiA+IEdpdHdlYjoKPiA+ID4gPgo+ ID4gPiA+ICAgICBodHRwOi8vZ2l0LmluZnJhZGVhZC5vcmcvdXNlcnMvaGNoL21pc2MuZ2l0L3No b3J0bG9nL3JlZnMvaGVhZHMvaG1tLWRldm1lbS1jbGVhbnVwLjIKPiA+Cj4gPiA+Cj4gPiA+IEF0 dGFjaGVkIGlzIG15IGluY3JlbWVudGFsIGZpeHVwcyBvbiB0b3Agb2YgdGhpcyBzZXJpZXMsIHdp dGggdGhvc2UKPiA+ID4gaW50ZWdyYXRlZCB5b3UgY2FuIGFkZDoKPiA+Cj4gPiBJJ3ZlIGZvbGRl ZCB5b3VyIGluY3JlbWVudGFsIGJpdHMgaW4gYW5kIHB1c2hlZCBvdXQgYSBuZXcKPiA+IGhtbS1k ZXZtZW0tY2xlYW51cC4zIHRvIHRoZSByZXBvIGFib3ZlLiAgTGV0IG1lIGtub3cgaWYgSSBkaWRu J3QgbWVzcwo+ID4gdXAgYW55dGhpbmcgZWxzZS4gIEknbGwgd2FpdCBmb3IgYSBmZXcgbW9yZSBj b21tZW50cyBhbmQgSmFzb24ncwo+ID4gcGxhbm5lZCByZWJhc2Ugb2YgdGhlIGhtbSBicmFuY2gg YmVmb3JlIHJlcG9zdGluZy4KPgo+IEkgc2FpZCBJIHdvdWxkbid0IHJlYmFzZSB0aGUgaG1tLmdp dCAoYXMgaXQgbmVlZHMgdG8gZ28gdG8gRFJNLCBBTUQKPiBhbmQgUkRNQSBnaXQgdHJlZXMpLi4K Pgo+IEluc3RlYWQgSSB3aWxsIG1lcmdlIHY1LjItcmM1IHRvIHRoZSB0cmVlIGJlZm9yZSBhcHBs eWluZyB0aGlzIHNlcmllcy4KPgo+IEkndmUgdW5kZXJzdG9vZCB0aGlzIHRvIGJlIExpbnVzJ3Mg cHJlZmVyZWQgd29ya2Zsb3cuCj4KPiBTbywgcGxlYXNlIHNlbmQgdGhlIG5leHQgaXRlcmF0aW9u IG9mIHRoaXMgYWdhaW5zdCBlaXRoZXIKPiBwbGFpbnY1LjItcmM1IG9yIHY1LjItcmM1IG1lcmdl ZCB3aXRoIGhtbS5naXQgYW5kIEknbGwgc29ydCBpdCBvdXQuCgpKdXN0IG1ha2Ugc3VyZSB0aGF0 IHdoZW4geW91IGJhY2ttZXJnZSB2NS4yLXJjNSB5b3UgaGF2ZSBhIGNsZWFyCnJlYXNvbiBpbiB0 aGUgbWVyZ2UgY29tbWl0IG1lc3NhZ2UgYWJvdXQgd2h5IHlvdSBuZWVkZWQgdG8gZG8gaXQuCldo aWxlIG5lZWRsZXNzIHJlYmFzaW5nIGlzIHRvcCBvZiB0aGUgcGV0IHBlZXZlIGxpc3QsIHNlY29u ZCBwbGFjZSwgYXMKSSBmb3VuZCBvdXQsIGlzIG15c3RlcnkgbWVyZ2VzIHdpdGhvdXQgZXhwbGFu YXRpb25zLgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=