From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Feb 2020 21:44:41 +0000 (-0800)
Subject: Merge tag 'compat-ioctl-fix' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd... 
X-Git-Tag: v5.15~4507
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b85080c106b1290eaebf100ee97babef833047d8;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'compat-ioctl-fix' of git://git./linux/kernel/git/arnd/playground

Pull compat-ioctl fix from Arnd Bergmann:
 "One patch in the compat-ioctl series broke 32-bit rootfs for multiple
  people testing on 64-bit kernels. Let's fix it in -rc1 before others
  run into the same issue"

* tag 'compat-ioctl-fix' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground:
  compat_ioctl: fix FIONREAD on devices
---

b85080c106b1290eaebf100ee97babef833047d8