From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C037CA6F for ; Fri, 6 Mar 2026 14:38:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772807918; cv=none; b=t/IdYXJWnxHu1x9/Nu453lJkTHXWKBiuoZZkMJxzQ4jcJTczCfI7Frq073WGg7PiWNZ6ljryEcfJQ9D9WFTkomCqL0LoWkc4ld2CqpuaSiC7ZHAy50AKAgPY1INI9IYRkdb+6tnvDHPBCpQj+HlsT+CMDWke2C3eXPtVzzkzrKo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772807918; c=relaxed/simple; bh=q1mdQxP70RrQv0FYyXGyehwbnlfa4Xr6GVJQJYVFteM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oVctu0v+3xgjrRsDyutaPmG4Bnhhoz4oyZuO8ebVr9qwilH7XUTK7gMuyOHU/F5g3nBBqh4B1RBib9sePI57THhskmL5zeQ4KzYZkTXOudrOFQKEqDNZ1QnU3Jv24FadP/Yopvuua6vYnwnHKz5tijJrTWO7viyn6p7EWN72MuM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XJ0+eZA3; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XJ0+eZA3" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-b9410af72c3so281947866b.2 for ; Fri, 06 Mar 2026 06:38:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772807916; x=1773412716; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=KbSWWVhxILTIKnFJVXIh92bVPsvqoeNRzf6Hu2YgsRw=; b=XJ0+eZA3bj5Iy8NBPSOiAY9w2Q61/+6AHuOEggYR8x7RNXg04gEfLnU25CxdvfMghD ab9Ai4H6ifcIZ0zwo/HG9RD/EOFzstZfmdcr+60zPhTSGA6hUSip/SYoKSBllKt/RUSx QzjujN+NN88/n5cOL1LbJM2MWuNB3RQAwRViXhRqjLGT2pV0FPXdE1nL+0HENJNLqRGC UpX74ekiIOwnv7uIi1Z7EVcWDPr5/51wYAxctjKa0vN/Yl+pmYGJoBHV+SuyHRrIolm6 XCnjWO2VEizeNfDuHHr9pX2RFt864kyKDZDkiF/rfwfbBiNwC9UWu5AcMjRSiHty/QH1 ie+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772807916; x=1773412716; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KbSWWVhxILTIKnFJVXIh92bVPsvqoeNRzf6Hu2YgsRw=; b=bzHS/vSIxKPnV0rVPSeJKnf3Dk5c9a4bmfRC/u5DZ3O526GatAy5r0EYjzyKBqJGHr nQ8YQ8L7pMVU201ge/AMro30TJF9WnUU+gpGTJuCeSpMmFf8mxoZZhGd8f4DBLJ6aazi XZVLM7g2+u1qYUAAczXWoPy9p0tnkrsoOhVVTE+UO+X3YvyxP+qMI+ZySZ9s6AyJxLZl QffEvTQJ3c+ERc3IUdkcn6tS5rCS7p3RS2NYNN9mTGcaCazBSitugUxteU9/T/vPK3Dn ShEqRaFOdE85TDbVvRd//n/fgsHNbMV6SqdXHy3vbn4KAgLFfNPfxeZagQg+NkuoQNvC cl5A== X-Forwarded-Encrypted: i=1; AJvYcCX6Iafd8ADl9TKZRJrLzJJOlOmclkl9lv/RKxtAmQwZilPVGp3i/bVqWwlbhQ7ypSElFpNZcehAfLjTGlg=@vger.kernel.org X-Gm-Message-State: AOJu0YwpAUG61a3Z63+gBjDRB33ZU5FoDfJO+NbYRtHDIdhrWP8Tn5aY 8eLYcFt4YuyZtacx+LCZuJmWQ0a/sffRXQp2DNgbVNTEgyjW5DnZT5sDhUtt5eIyugvdAdOxcVC I259HXag/0Lj6MJdOug== X-Received: from ejdbv13.prod.google.com ([2002:a17:907:fd0d:b0:b93:391a:d36c]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:2d10:b0:b8f:8660:3caf with SMTP id a640c23a62f3a-b942da2ac30mr135285766b.5.1772807915784; Fri, 06 Mar 2026 06:38:35 -0800 (PST) Date: Fri, 6 Mar 2026 14:38:34 +0000 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: Message-ID: Subject: Re: linux-next: manual merge of the mm-unstable tree with the char-misc.current tree From: Alice Ryhl To: Mark Brown Cc: Andrew Morton , David Hildenbrand , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="utf-8" 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!