From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 4 Feb 2021 14:36:49 +0000 (-0700)
Subject: Merge tag 'floppy-for-5.12' of https://github.com/evdenis/linux-floppy into for-5... 
X-Git-Tag: v5.12-rc1~154^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dced56c3a788ba54df439c004e555164ab90642;p=thirdparty%2Flinux.git

Merge tag 'floppy-for-5.12' of https://github.com/evdenis/linux-floppy into for-5.12/drivers

Pull floppy fix from Denis:

"Floppy patch for 5.12

- O_NDELAY/O_NONBLOCK fix for floppy from Jiri Kosina.
  libblkid is using O_NONBLOCK when probing devices.
  This leads to pollution of kernel log with error
  messages from floppy driver. Also the driver fails
  a mount prior to being opened without O_NONBLOCK
  at least once. The patch fixes the issues."

Signed-off-by: Denis Efremov <efremov@linux.com>

* tag 'floppy-for-5.12' of https://github.com/evdenis/linux-floppy:
  floppy: reintroduce O_NDELAY fix
---

1dced56c3a788ba54df439c004e555164ab90642