Message-ID: <53ACD9D1.2010803@oracle.com>
Date: Fri, 27 Jun 2014 12:41:21 +1000
From: James Morris <james.l.morris@oracle.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2
MIME-Version: 1.0
To: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Paul Moore <paul@paul-moore.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, "Serge E. Hallyn" <serge@hallyn.com>
Subject: Re: linux-next: the selinux tree needs cleaning up
References: <20140618084046.1bce12cc@canb.auug.org.au> <20140620085931.6427678d@canb.auug.org.au> <1474416.aEfMv8Ny53@sifl> <32647147.KmAPzBrbMT@sifl> <20140625095928.3161ebe1@canb.auug.org.au> <53AAA9BF.4090205@oracle.com> <20140626081232.52cb51da@canb.auug.org.au>
In-Reply-To: <20140626081232.52cb51da@canb.auug.org.au>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

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@oracle.com> 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/