From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Feb 2021 18:40:48 +0000 (-0800)
Subject: Merge tag 'dma-mapping-5.11-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: accepted/tizen/unified/20230118.172025~7930
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff92acb220c506f14aea384a07b130b87ac1489a;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'dma-mapping-5.11-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a 32 vs 64-bit padding issue in the new benchmark code (Barry
  Song)"

* tag 'dma-mapping-5.11-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: benchmark: use u8 for reserved field in uAPI structure
---

ff92acb220c506f14aea384a07b130b87ac1489a