From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2025 00:08:23 +0000 (+1100)
Subject: Merge branch 'docs-next' of git://git.lwn.net/linux.git
X-Git-Tag: next-20250225~116
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=46f24b8316876470d89b00fc67b451255b38ea94;p=linux%2F.git

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

46f24b8316876470d89b00fc67b451255b38ea94
diff --cc Documentation/filesystems/bcachefs/SubmittingPatches.rst
index a455f9cfd15c,4b79ca58faf2..18c79d548391
--- a/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).