linux-kernel - Re: linux-next: manual merge of the v4l-dvb tree with the asm-generic 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]

Date:   Wed, 4 Apr 2018 09:09:00 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Hans Verkuil <hans.verkuil@...co.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the
 asm-generic tree

Hi all,

On Thu, 15 Mar 2018 12:29:21 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   drivers/media/platform/blackfin/bfin_capture.c
> 
> between commit:
> 
>   b9ec40bf7d29 ("media: platform: remove blackfin capture driver")
> 
> from the asm-generic tree and commit:
> 
>   4471109e3894 ("media: convert g/s_parm to g/s_frame_interval in subdevs")
> 
> from the v4l-dvb 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.

This conflict now exists between the v4l-dvb tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped