linux-kernel - Re: linux-next: manual merge of the v4l-dvb-next tree with the arm-soc 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] [day] [month] [year] [list]

Message-ID: <20230216093033.111304fa@canb.auug.org.au>
Date:   Thu, 16 Feb 2023 09:30:33 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mauro Carvalho Chehab <mchehab@...nel.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Hans Verkuil <hverkuil-cisco@...all.nl>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Uwe Kleine-König 
        <u.kleine-koenig@...gutronix.de>
Subject: Re: linux-next: manual merge of the v4l-dvb-next tree with the
 arm-soc tree

Hi all,

On Thu, 9 Feb 2023 09:45:48 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the v4l-dvb-next tree got conflicts in:
> 
>   drivers/media/platform/ti/davinci/vpbe_display.c
>   drivers/media/platform/ti/davinci/vpbe_osd.c
>   drivers/media/platform/ti/davinci/vpbe_venc.c
> 
> between commit:
> 
>   eeee69739353 ("media: davinci: remove vpbe support")
> 
> from the arm-soc tree and commits:
> 
>   eb78ca6a0496 ("media: ti/davinci: vpbe_osd: Drop empty platform remove function")
>   5204a5dce04b ("media: ti/davinci: vpbe_venc: Drop empty platform remove function")
>   0d3732fb1b20 ("media: ti: davinci: vpbe_display.c: return 0 instead of 'ret'.")
> 
> from the v4l-dvb-next tree.
> 
> I fixed it up (I removed the files) 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 is now a conflict between the arm-soc tree and the v4l-dvb tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped