Commit 36ff37a1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 17195a7d ("iommufd: Fix race during abort for file descriptors") into android16-6.12-lts 



Steps on the way to 6.12.50

Resolves merge conflicts in:
        mm/swap.c

Change-Id: Ic03c55fe26b7db54541ba582ba5b21b55906eed5
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents bdb26509 17195a7d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment