Hi David,
On Wed, 12 Nov 2008 18:23:36 +0000 David Howells <dhowells@xxxxxxxxxx> wrote:
>
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > Today's linux-next merge of the creds tree got a conflicts in
> > security/keys/internal.h and security/keys/process_keys.c between commit
> > 1f8f5cf6e4f038552a3e47b66085452c08556d71 ("KEYS: Make request key
> > instantiate the per-user keyrings") from Linus' tree and
> > f71e534c1149637f4eb186b351e6afeb8584551c ("KEYS: Alter use of key
> > instantiation link-to-keyring argument") from the creds tree.
> >
> > It needs local knowledge to fix up, so I will drop the creds tree for
> > today.
>
> I've pushed a merge of that.
Thanks.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpfiOafOWH1x.pgp
Description: PGP signature
