archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Theodore Ts'o <>, Eric Biggers <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>
Subject: linux-next: manual merge of the ext4 tree with the fscrypt tree
Date: Fri, 22 May 2020 11:26:38 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]

Hi all,

Today's linux-next merge of the ext4 tree got a conflict in:


between commit:

  ed318a6cc0b6 ("fscrypt: support test_dummy_encryption=v2")

from the fscrypt tree and commit:

  e0198aff3ae3 ("ext4: reject mount options not supported when remounting in handle_mount_opt()")

from the ext4 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.

Stephen Rothwell

diff --cc fs/ext4/super.c
index 4a3d21972011,62e6ebc0c0ae..000000000000
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -1819,8 -1817,8 +1820,8 @@@ static const struct mount_opts 
  	{Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT},
  	{Opt_jqfmt_vfsv1, QFMT_VFS_V1, MOPT_QFMT},
  	{Opt_max_dir_size_kb, 0, MOPT_GTE0},
 -	{Opt_test_dummy_encryption, 0, MOPT_GTE0},
 +	{Opt_test_dummy_encryption, 0, MOPT_STRING},
- 	{Opt_nombcache, EXT4_MOUNT_NO_MBCACHE, MOPT_SET},
  	{Opt_err, 0, 0}

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-05-22  1:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-22  1:26 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-08-18 23:56 linux-next: manual merge of the ext4 tree with the fscrypt tree Stephen Rothwell
2017-10-30 14:48 Mark Brown
2017-11-13  5:56 ` 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* 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).