linux-kernel - Re: linux-next: manual merge of the v4l-dvb tree with Linus' 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 09 Apr 2010 02:22:29 -0300
From:	Mauro Carvalho Chehab <mchehab@...radead.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tejun Heo <tj@...nel.org>, Hans Verkuil <hverkuil@...all.nl>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Stephen,

Stephen Rothwell wrote:
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/meye.c between commit
> 5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
> and slab.h includes to prepare for breaking implicit slab.h inclusion
> from percpu.h") from Linus' tree and commit
> b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last
> V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the change
> for a while.

Thanks for pointing it to me. Fixed.

I also fixed today a conflict that it would appear on your next pull, between 
input and v4l-dvb, due to the upstream changes of keytable ops from
int to unsigned.

-- 

Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/