From: James Morris <jmorris@namei.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LSM List <linux-security-module@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Casey Schaufler <casey@schaufler-ca.com>
Subject: Re: [GIT] Security subsystem updates for 3.10
Date: Wed, 1 May 2013 12:37:23 +1000 (EST) [thread overview]
Message-ID: <alpine.LRH.2.02.1305011236040.7261@tundra.namei.org> (raw)
In-Reply-To: <CA+55aFz2o8i+VnW_S8VBKVkLX1Pw7nQimqm+c6yOQjs-5zE3hA@mail.gmail.com>
On Tue, 30 Apr 2013, Linus Torvalds wrote:
> On Sun, Apr 28, 2013 at 7:48 PM, James Morris <jmorris@namei.org> wrote:
> >
> > Note: I can't figure out why the patch from Lai Jiangshan shows up twice
> > in the shortlog. Everything checks out otherwise.
>
> Because you applied it twice. in two different branches.
>
> It's there in both your "stage-for-3.10" and "ra-next" branch, commits
> 505f14f7b8d4 and 921f3ac4c3f2 respectively.
I don't have a stage-for-3.10 branch in my tree -- this must have come in
via the smack tree.
> I would seriously suggest using gitk regularly (limit it to just your
> own stuff with something like "gitk origin.." or whatever) to see the
> history of what you've done visually as often as possible, not only
> does it show up very clearly if you do that, but it really helps to
> have a feel for what you've done.
Thanks. Will do.
- James
--
James Morris
<jmorris@namei.org>
prev parent reply other threads:[~2013-05-01 2:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 2:48 James Morris
2013-04-30 23:34 ` Linus Torvalds
2013-05-01 2:37 ` James Morris [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=alpine.LRH.2.02.1305011236040.7261@tundra.namei.org \
--to=jmorris@namei.org \
--cc=casey@schaufler-ca.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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
all inboxes | Powered by JetHome®