Merge branch 'master' into fopen_noflush

diff --cc ChangeLog.rst
index 96f4fb7af5ddba647799aac18264f0777413fd87,2dd8954336b31a7e2f6e15be1bf9b04e6d45aa1c..3c3be1e915bdfebec172f5eb7e2bec7d0eeee919
--- 1/ChangeLog.rst
--- 2/ChangeLog.rst
+++ b/ChangeLog.rst
@@@ -1,8 -1,5 +1,10 @@@
 +Unreleased Changes
 +==================
 +
 +* Add support for flag FOPEN_NOFLUSH for avoiding flush on close.
 +
+ * Fixed returning an error condition to ioctl(2)
+ 
  libfuse 3.10.5 (2021-09-06)
  ===========================
  

diff --cc lib/fuse.c
Simple merge