From: Mark Brown <broonie@kernel.org>
To: David Howells <dhowells@redhat.com>,
Richard Weinberger <richard@nod.at>,
Artem Bityutskiy <dedekind1@gmail.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Al Viro <viro@ZenIV.linux.org.uk>,
Wenwen Wang <wenwen@cs.uga.edu>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
linux-mtd@lists.infradead.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the vfs tree with the ubifs tree
Date: Mon, 16 Sep 2019 14:40:29 +0100 [thread overview]
Message-ID: <20190916134029.GF4352@sirena.co.uk> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 843 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ubifs/super.c
between commit:
9163e0184bd7d5f ("ubifs: Fix memory leak bug in alloc_ubifs_info() error path")
from the ubifs tree and commit:
50d7aad57710e2b ("vfs: Convert ubifs to use the new mount API")
from the vfs tree.
I fixed it up dropping the ubifs change 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.
diff --cc fs/ubifs/super.c
index 7d4547e5202de,a5fa725e7cf16..0000000000000
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 144 bytes --]
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next reply other threads:[~2019-09-16 13:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 13:40 Mark Brown [this message]
2019-09-16 16:37 ` linux-next: manual merge of the vfs tree with the ubifs tree Richard Weinberger
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=20190916134029.GF4352@sirena.co.uk \
--to=broonie@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=dedekind1@gmail.com \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-next@vger.kernel.org \
--cc=richard@nod.at \
--cc=viro@ZenIV.linux.org.uk \
--cc=wenwen@cs.uga.edu \
/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).