Skip to contentSkip to conversation

mm/gup: track FOLL_PIN squash-candidate patches are not squashed (yet?)

DISCUSSION John Hubbard 3 participants 4 messages Mar 19, 2020 – Mar 21, 2020 Memory management

lore
Share & tools
lore
#0 lore raw

Hi Andrew,

I see the following commits in linux-next. I'm wondering if all is well, because I understood that these were all going to be squashed into the first commit (3d37f4aceb31), yes?

(This is the first time I've participated in the "squash" aspect of linux-mm workflow, as you can probably tell.)

08baf249e844 mm-gup-track-foll_pin-pages-fix-2-fix <Andrew Morton>
10a9eb3afdf1 mm/gup: fixup for 9947ea2c1e608e32 "mm/gup: track FOLL_PIN pages" <Claudio Imbrenda> b982245014e1 mm/gup: fixup for ce35133be382 mm/gup: track FOLL_PIN pages <John Hubbard> 3d37f4aceb31 mm/gup: track FOLL_PIN pages <John Hubbard>

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
#1 lore raw
Quoted 8 lines · John Hubbard

Hi Andrew,

I see the following commits in linux-next. I'm wondering if all is well, because I understood that these were all going to be squashed into the first commit (3d37f4aceb31), yes?

(This is the first time I've participated in the "squash" aspect of linux-mm workflow, as you can probably tell.)

AFAIK Andrew (or his scripts) does the squashing only at the last moment before sending patches to Linus. The mmotm import to -next could do it as well I guess, but do you expect a benefit e.g. for bisects?

Quoted 9 lines

08baf249e844 mm-gup-track-foll_pin-pages-fix-2-fix <Andrew Morton>
10a9eb3afdf1 mm/gup: fixup for 9947ea2c1e608e32 "mm/gup: track FOLL_PIN pages" <Claudio Imbrenda> b982245014e1 mm/gup: fixup for ce35133be382 mm/gup: track FOLL_PIN pages <John Hubbard> 3d37f4aceb31 mm/gup: track FOLL_PIN pages <John Hubbard>

thanks,

#2 lore raw
Quoted 7 lines · Vlastimil Babka
Quoted 6 lines · John Hubbard

Hi Andrew,

I see the following commits in linux-next. I'm wondering if all is well, because I understood that these were all going to be squashed into the first commit (3d37f4aceb31), yes?

Quoted 6 lines
Quoted 2 lines

(This is the first time I've participated in the "squash" aspect of linux-mm workflow, as you can probably tell.)

AFAIK Andrew (or his scripts) does the squashing only at the last moment before sending patches to Linus. The mmotm import to -next could do it as well I guess, but do you expect a benefit e.g. for bisects?

Squashing would only help very slightly in this case, for bisects. That's because 08baf249e844 fixes a build warning. And I don't think it's necessary to do it any sooner than usual. I just thought it was accidentally overlooked, because I didn't know that the squashing is done at the last minute.

All is well, then.

thanks,

Signature · 2 lines
John Hubbard
NVIDIA
Quoted 7 lines
Quoted 7 lines

08baf249e844 mm-gup-track-foll_pin-pages-fix-2-fix <Andrew Morton>
10a9eb3afdf1 mm/gup: fixup for 9947ea2c1e608e32 "mm/gup: track FOLL_PIN pages" <Claudio Imbrenda> b982245014e1 mm/gup: fixup for ce35133be382 mm/gup: track FOLL_PIN pages <John Hubbard> 3d37f4aceb31 mm/gup: track FOLL_PIN pages <John Hubbard>

maintainer
#3 lore raw
Quoted 16 lines · On Fri, 20 Mar 2020 10:49:53 -0700 John Hubbard <[email protected]> wrote:
Quoted 7 lines · Vlastimil Babka
Quoted 6 lines · John Hubbard

Hi Andrew,

I see the following commits in linux-next. I'm wondering if all is well, because I understood that these were all going to be squashed into the first commit (3d37f4aceb31), yes?

Quoted 6 lines
Quoted 2 lines

(This is the first time I've participated in the "squash" aspect of linux-mm workflow, as you can probably tell.)

AFAIK Andrew (or his scripts) does the squashing only at the last moment before sending patches to Linus. The mmotm import to -next could do it as well I guess, but do you expect a benefit e.g. for bisects?

Quoted 7 lines

Squashing would only help very slightly in this case, for bisects. That's because 08baf249e844 fixes a build warning. And I don't think it's necessary to do it any sooner than usual. I just thought it was accidentally overlooked, because I didn't know that the squashing is done at the last minute.

All is well, then.

Yes, I like to have the whole history there for my final review before sending upstream.

The bisection issue could be a hassle, but the various buildbots seem to have figured out that if foo.patch is immediately followed by foo-fix.patch then do the obvious thing.