Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190916134029.GF4352@sirena.co.uk>
In-Reply-To: <20190916134029.GF4352@sirena.co.uk>
From:   Richard Weinberger <richard.weinberger@gmail.com>
Date:   Mon, 16 Sep 2019 18:37:15 +0200
Message-ID: <CAFLxGvwZPBg7834aq4rqJyxMNCkNThPa2hGuwuuzpxYkHiQN7Q@mail.gmail.com>
Subject: Re: linux-next: manual merge of the vfs tree with the ubifs tree
To:     Mark Brown <broonie@kernel.org>
Cc:     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>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        linux-mtd@lists.infradead.org,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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