Merge a4dec04c ("Merge tag 'dma-mapping-5.12' of...

Merge a4dec04c ("Merge tag 'dma-mapping-5.12' of git://git.infradead.org/users/hch/dma-mapping"

) into android-mainline

Steps on the way to 5.12-rc1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I90e0e534d9ed015f2de519498011dcd9ca06ef75