Linux Container Development
 help / color / mirror / Atom feed
From: "Serge E. Hallyn" <serue@us.ibm.com>
To: Casey Schaufler <casey@schaufler-ca.com>
Cc: Oren Laadan <orenl@cs.columbia.edu>,
	Linux Containers <containers@lists.osdl.org>,
	linux-security-module@vger.kernel.org,
	SELinux <selinux@tycho.nsa.gov>
Subject: Re: [RFC PATCH 2/2] cr: debug security_checkpoint_header and security_may_restart
Date: Wed, 9 Sep 2009 14:46:59 -0500	[thread overview]
Message-ID: <20090909194659.GA1065@us.ibm.com> (raw)
In-Reply-To: <4AA7C138.6000205@schaufler-ca.com>

Quoting Casey Schaufler (casey@schaufler-ca.com):
> Serge E. Hallyn wrote:
> > Quoting Casey Schaufler (casey@schaufler-ca.com):
> >   
> >> Serge E. Hallyn wrote:
> >>     
> >>> Quoting Casey Schaufler (casey@schaufler-ca.com):
> >>> Sorry, the c/r tree is at:
> >>>
> >>> git://git.ncl.cs.columbia.edu/pub/git/linux-cr.git
> >>>   
> >>>       
> >> The four patches from 08/28 (2-5) and the two from 09/03
> >> are not happy applying to this tree. Am I missing a patch?
> >>
> >>     
> >
> > There was this patch which was 1/5
> > 	https://lists.linux-foundation.org/pipermail/containers/2009-August/020212.html
> >
> > But there have also been some changes since that posting to the
> > git tree.  You could rewind the git tree to the state it was in
> > on aug 28, but I'll need to forward-port my patches anyway, so
> > let me do that this afternoon and resend the patchset.
> >
> >   
> 
> I figured it was something like that. Thank you.

Actually the patches still apply cleanly.  But it turns out
that when you clone the linux-cr tree, it pulls the ckpt-v17
branch, and only the ckpt-v17 branch.  It is hugely different
from the ckpt-v17-dev tree, which is the one you want.  So
assuming you created a kernel tree by doing git clone
git://git.ncl.cs.columbia.edu/pub/git/linux-cr.git (as opposed
to tweaking your .git/config in another git tree), then you
want to:

	git fetch origin ckpt-v17-dev:ckpt-v17-dev
	git checkout ckpt-v17-dev

The lsm c/r patches should apply cleanly there.

thanks,
-serge

      reply	other threads:[~2009-09-09 19:46 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-09-03 22:28 [RFC PATCH 1/2] cr: lsm: provide hooks for an LSM to track policy changes Serge E. Hallyn
2009-09-03 22:28 ` [RFC PATCH 2/2] cr: debug security_checkpoint_header and security_may_restart Serge E. Hallyn
2009-09-04  5:20   ` Casey Schaufler
2009-09-04 13:46     ` Serge E. Hallyn
2009-09-07 18:31       ` Casey Schaufler
2009-09-08  4:12         ` Serge E. Hallyn
2009-09-09  4:43           ` Casey Schaufler
2009-09-09 14:35             ` Serge E. Hallyn
2009-09-09 14:52               ` Casey Schaufler
2009-09-09 19:46                 ` Serge E. Hallyn [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090909194659.GA1065@us.ibm.com \
    --to=serue@us.ibm.com \
    --cc=casey@schaufler-ca.com \
    --cc=containers@lists.osdl.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=orenl@cs.columbia.edu \
    --cc=selinux@tycho.nsa.gov \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox