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

Date:	Tue, 4 Sep 2012 13:09:21 +1000
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,
	Russell King <rmk@....linux.org.uk>,
	Javier Martin <javier.martin@...ta-silicon.com>
Subject: linux-next: manual merge of the v4l-dvb tree with the arm tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit 895576427dca
("ARM: iMX: visstrim_m10: use arm_memblock_steal") from the arm tree and
commit b6c14dc29757 ("[media] Visstrim M10: Add support for Coda") from
the v4l-dvb tree.

I just used the version from the v4l-dvb tree and can carry that fix as
necessary (no action is required).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped