From: Richard Weinberger <richard.weinberger@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Wenwen Wang <wenwen@cs.uga.edu>,
Artem Bityutskiy <dedekind1@gmail.com>,
Richard Weinberger <richard@nod.at>,
Adrian Hunter <adrian.hunter@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
linux-mtd@lists.infradead.org, Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the vfs tree with the ubifs tree
Date: Mon, 16 Sep 2019 18:37:15 +0200 [thread overview]
Message-ID: <CAFLxGvwZPBg7834aq4rqJyxMNCkNThPa2hGuwuuzpxYkHiQN7Q@mail.gmail.com> (raw)
In-Reply-To: <20190916134029.GF4352@sirena.co.uk>
On Mon, Sep 16, 2019 at 3:40 PM Mark Brown <broonie@kernel.org> wrote:
>
> 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.
Thanks a lot for letting me know!
--
Thanks,
//richard
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
prev parent reply other threads:[~2019-09-16 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 13:40 linux-next: manual merge of the vfs tree with the ubifs tree Mark Brown
2019-09-16 16:37 ` Richard Weinberger [this message]
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=CAFLxGvwZPBg7834aq4rqJyxMNCkNThPa2hGuwuuzpxYkHiQN7Q@mail.gmail.com \
--to=richard.weinberger@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=broonie@kernel.org \
--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).