From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 Apr 2020 15:46:59 +0000 (-0700)
Subject: Merge tag '9p-for-5.7' of git://github.com/martinetd/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e14679b62d84b8ab9136189fc069d389da43fe71;p=linux.git

Merge tag '9p-for-5.7' of git://github.com/martinetd/linux

Pull 9p updates from Dominique Martinet:
 "Not much new, but a few patches for this cycle:

   - Fix read with O_NONBLOCK to allow incomplete read and return
     immediately

   - Rest is just cleanup (indent, unused field in struct, extra
     semicolon)"

* tag '9p-for-5.7' of git://github.com/martinetd/linux:
  net/9p: remove unused p9_req_t aux field
  9p: read only once on O_NONBLOCK
  9pnet: allow making incomplete read requests
  9p: Remove unneeded semicolon
  9p: Fix Kconfig indentation
---

e14679b62d84b8ab9136189fc069d389da43fe71