linux-kernel - linux-next: manual merge of the akpm 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20111109135353.69057bcd2463a6ea009b898e@canb.auug.org.au>
Date:	Wed, 9 Nov 2011 13:53:53 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mauro Carvalho Chehab <mchehab@...radead.org>,
	Hans Verkuil <hverkuil@...all.nl>
Subject: linux-next: manual merge of the akpm tree with the v4l-dvb tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict between commit
"poll: add poll_requested_events() function" the v4l-dvb and akpm trees.
It was very similar (but not identical), so I dropeed it from the akpm
tree.

BTW Mauro, that commit in v4l-dvb comes from a branch that contains a
series of patches that have various Signed-off-by's but not yours ... it
looks like they were imported from patchwork, but you forgot to add your
SOB line.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped