lkml.org 
[lkml]   [2019]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: linux-next: manual merge of the vfs tree with the ubifs tree
    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

    \
     
     \ /
      Last update: 2019-09-16 18:37    [W:3.455 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site