lkml.org 
[lkml]   [2010]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the security-testing tree with Linus' tree
Hi James,

Today's linux-next merge of the security-testing tree got a conflict in
security/keys/keyring.c between commit
cea7daa3589d6b550546a8c8963599f7c1a3ae5c ("KEYS: find_keyring_by_name()
can gain access to a freed keyring") from Linus' tree and commit
c5b60b5e67af8be4c58d3ffcc36894f69c4fbdc1 ("security: whitespace coding
style fixes") from the security-testing tree.

I just used the version from Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-05-06 04:33    [W:0.097 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site