linux-kernel - 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Mon, 10 May 2010 10:29:24 +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,
	"Bjørn Mork" <bjorn@...k.no>
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/dvb/ttpci/budget.c between commit
6f550dc08369ee0bc6402963c377e65f0f2e3b71 ("V4L/DVB: budget: Oops: "BUG:
unable to handle kernel NULL pointer 	dereference"") from Linus'
tree and commit 2bf92108b679637c2e50114f4c655d7cc608a1d9 ("[v2, for,
v4l-dvb, 	master] V4L/DVB: budget: Oops: "BUG: unable to handle
kernel NULL 	pointer dereference"") from the v4l-dvb tree.

I just used the version of that file from the v4l-dvb tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped