linux-kernel - linux-next: manual merge of the trivial 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]

Date:	Tue, 27 Sep 2011 14:23:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>
Subject: linux-next: manual merge of the trivial tree with the v4l-dvb tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/s5p-fimc/fimc-capture.c between commit 2319c539e39b
("[media] s5p-fimc: Remove sensor management code from FIMC capture
driver") from the v4l-dvb tree and commit 18df7b82e25c ("treewide:
Correct spelling of successfully in comments") from the trivial tree.

The former removed the code that the latter modified.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped