On 11/14/25 12:21, Balbir Singh wrote: > A fix-up in the thp device-private patch > mm/rmap: extend rmap and migration support device-private entries > introduces conflicts with the softleaf series, this is a fix up patch > to resolve the issue > > Cc: Andrew Morton <[email protected]> > Cc: David Hildenbrand <[email protected]> > Cc: Zi Yan <[email protected]> > Cc: Joshua Hahn <[email protected]> > Cc: Rakie Kim <[email protected]> > Cc: Byungchul Park <[email protected]> > Cc: Gregory Price <[email protected]> > Cc: Ying Huang <[email protected]> > Cc: Alistair Popple <[email protected]> > Cc: Oscar Salvador <[email protected]> > Cc: Lorenzo Stoakes <[email protected]> > Cc: Baolin Wang <[email protected]> > Cc: "Liam R. Howlett" <[email protected]> > Cc: Nico Pache <[email protected]> > Cc: Ryan Roberts <[email protected]> > Cc: Dev Jain <[email protected]> > Cc: Barry Song <[email protected]> > Cc: Lyude Paul <[email protected]> > Cc: Danilo Krummrich <[email protected]> > Cc: David Airlie <[email protected]> > Cc: Simona Vetter <[email protected]> > Cc: Ralph Campbell <[email protected]> > Cc: Mika Penttilä <[email protected]> > Cc: Matthew Brost <[email protected]> > Cc: Francois Dugast <[email protected]> > > Signed-off-by: Balbir Singh <[email protected]> > --- > mm/huge_memory.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 3a8f0c4143c5..4d65c51bc0fe 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -4760,7 +4760,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk > *pvmw, struct page *new) > folio_get(folio); > pmde = folio_mk_pmd(folio, READ_ONCE(vma->vm_page_prot)); > > - if (is_writable_migration_entry(entry)) > + if (softleaf_is_migration_write(entry)) > pmde = pmd_mkwrite(pmde, vma); > > if (folio_is_device_private(folio)) { > @@ -4777,8 +4777,6 @@ void remove_migration_pmd(struct page_vma_mapped_walk > *pvmw, struct page *new) > > if (pmd_swp_soft_dirty(*pvmw->pmd)) > pmde = pmd_mksoft_dirty(pmde); > - if (softleaf_is_migration_write(entry)) > - pmde = pmd_mkwrite(pmde, vma); > if (pmd_swp_uffd_wp(*pvmw->pmd)) > pmde = pmd_mkuffd_wp(pmde); > if (!softleaf_is_migration_young(entry))
Hi, Andrew This is the fixup for the rebase issue that might occur after applying the previous patch to fixup mm/rmap: extend rmap and migration support device-private entries. I've not done fixs up rebases as a separate patch, but I resolved the conflict in favour of the existing patch and applied this on top of the series. Balbir
