linux-kernel - linux-next: manual merge of the staging tree with the v4l-dvb 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: <20141124191009.7f4fbf31@canb.auug.org.au>
Date:	Mon, 24 Nov 2014 19:10:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hans Verkuil <hans.verkuil@...co.com>,
	Aybuke Ozdemir <aybuke.147@...il.com>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/media/omap24xx/tcm825x.c between commit db85a0403be4
("[media] omap24xx/tcm825x: remove deprecated omap2 camera drivers")
from the v4l-dvb tree and commit 1002a240ed72 ("staging: media:
omap24xx: Use min_t instead of min") from the staging tree.

I fixed it up (the former removed the file, so I did that) and can
carry the fix as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped