On Wed, 5 Nov 2008, David Howells wrote:
>
> Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> > Today's linux-next merge of the creds tree got a conflict in
> > security/selinux/hooks.c between commit
> > 41d9f9c524a53477467b7e0111ff3d644198f191 ("SELinux: hold tasklist_lock
> > and siglock while waking wait_chldexit") from security-testing tree and
> > commit a3338909826d32d821158a6adc43ce0a1654b31d ("CRED: Make execve()
> > take advantage of copy-on-write credentials") from the creds tree.
> >
> > I can't see how to fix this easily, so I will have to drop the tree for
> > today. Please try the merge for yourself and see if you can come up with
> > a solution, thanks.
>
> James: is it worth you pulling my patches into your tree?
Possibly after I get back from foss.my next week. Can you tru and get
more of the API changes into subsytem trees?
--
James Morris
<jmorris@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
