From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Randy Dunlap <rdunlap@infradead.org>,
Damien Le Moal <damien.lemoal@wdc.com>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: linux-next: manual merge of the jc_docs tree with Linus' tree
Date: Tue, 3 Mar 2020 10:25:23 +1100 [thread overview]
Message-ID: <20200303102523.0b3b4e52@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/filesystems/zonefs.rst
between commit:
4c5fd3b791a0 ("zonefs: fix documentation typos etc.")
from Linus' tree and commit:
9a6108124c1d ("docs: filesystems: convert zonefs.txt to ReST")
from the jc_docs tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/filesystems/zonefs.rst
index d54fa98ac158,7e733e751e98..000000000000
--- a/Documentation/filesystems/zonefs.rst
+++ b/Documentation/filesystems/zonefs.rst
@@@ -301,7 -308,8 +308,8 @@@ Mount option
zonefs define the "errors=<behavior>" mount option to allow the user to specify
zonefs behavior in response to I/O errors, inode size inconsistencies or zone
-condition chages. The defined behaviors are as follow:
+condition changes. The defined behaviors are as follow:
+
* remount-ro (default)
* zone-ro
* zone-offline
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-03-02 23:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 23:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-22 23:50 linux-next: manual merge of the jc_docs tree with Linus' tree Stephen Rothwell
2019-07-25 0:26 Stephen Rothwell
2019-05-09 0:44 Stephen Rothwell
2017-10-31 23:35 Stephen Rothwell
2017-10-19 11:32 Mark Brown
2016-08-05 2:42 Stephen Rothwell
2015-10-12 2:38 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200303102523.0b3b4e52@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=corbet@lwn.net \
--cc=damien.lemoal@wdc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=rdunlap@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).