* linux-next: manual merge of the v4l-dvb tree with the arm tree
@ 2012-09-04 3:09 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2012-09-04 3:09 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Russell King, Javier Martin
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-04 3:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04 3:09 linux-next: manual merge of the v4l-dvb tree with the arm tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).