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

Message-Id: <20130321120522.611e75952eb159bcf97f9cdf@canb.auug.org.au>
Date:	Thu, 21 Mar 2013 12:05:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Martin Schwidefsky <schwidefsky@...ibm.com>,
	Heiko Carstens <heiko.carstens@...ibm.com>,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: linux-next: manual merge of the v4l-dvb tree with the s390 tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/platform/Kconfig between commit c30f46bcf9b3
("drivers/Kconfig: add several missing GENERIC_HARDIRQS dependencies")
from the s390 tree and commit da508f579965 ("[media] media/v4l2:
VIDEOBUF2_DMA_CONTIG should depend on HAS_DMA") from the v4l-dvb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/media/platform/Kconfig
index a0639e7,42c62aa..0000000
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@@ -204,7 -204,7 +204,7 @@@ config VIDEO_SAMSUNG_EXYNOS_GS
  
  config VIDEO_SH_VEU
  	tristate "SuperH VEU mem2mem video processing driver"
- 	depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS
 -	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
++	depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS && HAS_DMA
  	select VIDEOBUF2_DMA_CONTIG
  	select V4L2_MEM2MEM_DEV
  	help

Content of type "application/pgp-signature" skipped