Re: linux-next: manual merge of the mm-unstable tree with the char-misc.current tree

[Alice Ryhl <aliceryhl@google.com>]

On Fri, Mar 06, 2026 at 12:58:43PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the mm-unstable tree got a conflict in:
> 
>   drivers/android/binder/page_range.rs
> 
> between commit:
> 
>   8ef2c15aeae07 ("rust_binder: check ownership before using vma")
> 
> from the char-misc.current tree and commit:
> 
>   3c9b6aa5c9119 ("mm: rename zap_page_range_single() to zap_vma_range()")
> 
> from the mm-unstable tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/android/binder/page_range.rs
> index 9dfc154e5dd4e,2fddd4ed8d4c4..0000000000000
> --- a/drivers/android/binder/page_range.rs
> +++ b/drivers/android/binder/page_range.rs
> @@@ -759,11 -717,9 +759,11 @@@ unsafe extern "C" fn rust_shrink_free_p
>       // SAFETY: The lru lock is locked when this method is called.
>       unsafe { bindings::spin_unlock(&raw mut (*lru).lock) };
>   
>  -    if let Some(vma) = mmap_read.vma_lookup(vma_addr) {
>  -        let user_page_addr = vma_addr + (page_index << PAGE_SHIFT);
>  -        vma.zap_vma_range(user_page_addr, PAGE_SIZE);
>  +    if let Some(unchecked_vma) = mmap_read.vma_lookup(vma_addr) {
>  +        if let Some(vma) = check_vma(unchecked_vma, range_ptr) {
>  +            let user_page_addr = vma_addr + (page_index << PAGE_SHIFT);
> -             vma.zap_page_range_single(user_page_addr, PAGE_SIZE);
> ++            vma.zap_vma_range(user_page_addr, PAGE_SIZE);
>  +        }
>       }

LGTM thanks!