Re: linux-next: the selinux tree needs cleaning up

From: James Morris
Date: Thu Jun 26 2014 - 22:42:18 EST


On 06/26/2014 08:12 AM, Stephen Rothwell wrote:
Hi James,

On Wed, 25 Jun 2014 20:51:43 +1000 James Morris <james.l.morris@xxxxxxxxxx> wrote:

I haven't pulled in Paul's tree, I merged with the latest Linus release.

Ummm, yesterday your security tree
(git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next)
moved from commit 2fd4e6698f08 ("Merge branch 'smack-for-3.16' of
git://git.gitorious.org/smack-next/kernel into next") (which is
included in v3.16-rc1) to commit f01387d26938 ("Merge commit 'v3.15'
into next"). The commit between those 2 commits is 92953ff38ba5
("Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux
into next").


Ok, I thought you meant pulled in more recently.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/