linux-kernel - 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-next>] [day] [month] [year] [list]

Message-ID: <20230123100923.7899a60f@canb.auug.org.au>
Date:   Mon, 23 Jan 2023 10:09:23 +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>
Subject: linux-next: manual merge of the v4l-dvb-next tree with the arm-soc
 tree

Hi all,

Today's linux-next merge of the v4l-dvb-next tree got conflicts in:

  drivers/staging/media/Kconfig
  drivers/staging/media/Makefile

between commit:

  582603a95734 ("staging: media: remove davinci vpfe_capture driver")

from the arm-soc tree and commit:

  d2a8e92f0b41 ("media: vpfe_capture: remove deprecated davinci drivers")

from the v4l-dvb-next tree.

These 2 commits removed the same driver but caused a conflict due to
other changes to these files.

I fixed it up (I just used the latter version of these 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped