Messages in this thread | | | Date | Thu, 6 May 2010 12:30:49 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |