diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-26 03:49:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-26 03:49:04 +0300 |
| commit | a57066b1a01977a646145f4ce8dfb4538b08368a (patch) | |
| tree | 57c2b4fa2fc48e687a1820b9bf4ef4f4363be0f9 /Documentation/filesystems | |
| parent | dfecd3e00cd32b2a6d1cfdb30b513dd42575ada3 (diff) | |
| parent | 04300d66f0a06d572d9f2ad6768c38cabde22179 (diff) | |
| download | linux-a57066b1a01977a646145f4ce8dfb4538b08368a.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The UDP reuseport conflict was a little bit tricky.
The net-next code, via bpf-next, extracted the reuseport handling
into a helper so that the BPF sk lookup code could invoke it.
At the same time, the logic for reuseport handling of unconnected
sockets changed via commit efc6b6f6c3113e8b203b9debfb72d81e0f3dcace
which changed the logic to carry on the reuseport result into the
rest of the lookup loop if we do not return immediately.
This requires moving the reuseport_has_conns() logic into the callers.
While we are here, get rid of inline directives as they do not belong
in foo.c files.
The other changes were cases of more straightforward overlapping
modifications.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/overlayfs.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/filesystems/overlayfs.rst b/Documentation/filesystems/overlayfs.rst index 660dbaf0b9b8..fcda5d6ba9ac 100644 --- a/Documentation/filesystems/overlayfs.rst +++ b/Documentation/filesystems/overlayfs.rst @@ -560,8 +560,8 @@ When the NFS export feature is enabled, all directory index entries are verified on mount time to check that upper file handles are not stale. This verification may cause significant overhead in some cases. -Note: the mount options index=off,nfs_export=on are conflicting and will -result in an error. +Note: the mount options index=off,nfs_export=on are conflicting for a +read-write mount and will result in an error. Testsuite |