linux-kernel - Re: linux-next: manual merge of the v4l-dvb-next tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20171214141913.5c6ede97@vento.lan>
Date:   Thu, 14 Dec 2017 14:19:13 -0200
From:   Mauro Carvalho Chehab <mchehab@....samsung.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Al Viro <viro@...IV.linux.org.uk>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Sean Young <sean@...s.org>
Subject: Re: linux-next: manual merge of the v4l-dvb-next tree with the vfs
 tree

Hi Stephen,

Em Mon, 11 Dec 2017 11:28:54 +1100
Stephen Rothwell <sfr@...b.auug.org.au> escreveu:

> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb-next tree got a conflict in:
> 
>   drivers/staging/media/lirc/lirc_zilog.c
> 
> between commit:
> 
>   c23e0cb81e40 ("media: annotate ->poll() instances")
> 
> from the vfs tree and commit:
> 
>   28032a347ed0 ("media: staging: remove lirc_zilog driver")
> 
> from the v4l-dvb-next tree.
> 
> I fixed it up (I just removed the file) 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.

FYI,

I had to rebase the patch series on the top of media tree.

You'll likely be facing the same conflicts with vfs after the
rebase, with different changeset identifiers.


-- 
Thanks,
Mauro