Merge "Allow more file ioctls"