Hi David, Today's linux-next merge of the creds tree got conflicts against the security-testing tree (besides the two I tried to fix up). I have dropped it again for today. I think the only way forward is for you and James to come to some arrangement. Probably this will involve James merging your tree into his and me removing creds as a separate tree from linux-next. You may have to consider what happens to the userns tree as well (which I have had to drop today as well since it depends on the creds tree). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpLNsRu4C3KL.pgp
Description: PGP signature
