diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2026-05-25 13:48:00 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2026-05-25 13:48:00 -0300 |
| commit | e312f0ff9e180e8ebfdab2419898e82cf5408944 (patch) | |
| tree | c670d4dacbf22b65f9c53d4c62937705386f9768 /drivers/android/binder/range_alloc/array.rs | |
| parent | b86fd95805a7bd4c5b9465c9e7f75e45bbe7eb6f (diff) | |
| parent | e7ae89a0c97ce2b68b0983cd01eda67cf373517d (diff) | |
Merge tag 'v7.1-rc5' into rdma.git for-next
For dependencies in the following patches
Resolve conflicts, use the goto labels from the rc tag.
* tag 'v7.1-rc5': (1526 commits)
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/android/binder/range_alloc/array.rs')
| -rw-r--r-- | drivers/android/binder/range_alloc/array.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/android/binder/range_alloc/array.rs b/drivers/android/binder/range_alloc/array.rs index ada1d1b4302e..081d19b09d4b 100644 --- a/drivers/android/binder/range_alloc/array.rs +++ b/drivers/android/binder/range_alloc/array.rs @@ -204,7 +204,6 @@ impl<T> ArrayRangeAllocator<T> { // caller will mark them as unused, which means that they can be freed if the system comes // under memory pressure. let mut freed_range = FreedRange::interior_pages(offset, size); - #[expect(clippy::collapsible_if)] // reads better like this if offset % PAGE_SIZE != 0 { if i == 0 || self.ranges[i - 1].endpoint() <= (offset & PAGE_MASK) { freed_range.start_page_idx -= 1; |