Merge branch 'docs-next' of git://git.lwn.net/linux.git

diff --cc Documentation/ABI/testing/sysfs-fs-f2fs
Simple merge

diff --cc Documentation/admin-guide/README.rst
Simple merge

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc Documentation/filesystems/bcachefs/SubmittingPatches.rst
index a455f9cfd15c79e6b180e8dcb54f0cdc81d45885,4b79ca58faf27d9e9471da15e164a87092b94fb9..18c79d5483911d3187406621fbc7a5c55c290b47
--- 1/Documentation/filesystems/bcachefs/SubmittingPatches.rst
--- 2/Documentation/filesystems/bcachefs/SubmittingPatches.rst
+++ b/Documentation/filesystems/bcachefs/SubmittingPatches.rst
@@@ -31,11 -26,11 +31,11 @@@ considered out of date), but try not t
  Focus on writing code that reads well and is organized well; code should be
  aesthetically pleasing.
  
 -CI:
 -===
 +CI
 +--
  
  Instead of running your tests locally, when running the full test suite it's
- prefereable to let a server farm do it in parallel, and then have the results
+ preferable to let a server farm do it in parallel, and then have the results
  in a nice test dashboard (which can tell you which failures are new, and
  presents results in a git log view, avoiding the need for most bisecting).
  

diff --cc MAINTAINERS
Simple merge

diff --cc include/asm-generic/io.h
Simple merge