lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.02.1305011236040.7261@tundra.namei.org>
Date:	Wed, 1 May 2013 12:37:23 +1000 (EST)
From:	James Morris <jmorris@...ei.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
cc:	LSM List <linux-security-module@...r.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Casey Schaufler <casey@...aufler-ca.com>
Subject: Re: [GIT] Security subsystem updates for 3.10

On Tue, 30 Apr 2013, Linus Torvalds wrote:

> On Sun, Apr 28, 2013 at 7:48 PM, James Morris <jmorris@...ei.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@...ei.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ