linux-kernel - Re: [GIT] Security subsystem changes for 2.6.38

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LRH.2.00.1101140826340.27060@tundra.namei.org>
Date:	Fri, 14 Jan 2011 08:29:22 +1100 (EST)
From:	James Morris <jmorris@...ei.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
cc:	linux-security-module@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT] Security subsystem changes for 2.6.38

On Mon, 10 Jan 2011, Linus Torvalds wrote:

> On Mon, Jan 10, 2011 at 1:56 PM, James Morris <jmorris@...ei.org> wrote:
> >
> > In these cases it's my local 'master', which is tracking your tree.  I'll
> > look at renaming that or creating a new branch called linus-master.
> 
> That doesn't much help. It now says the source, but still gives no
> indication _why_ you pulled.
> 
> If you want to sync up, use a tag or something. Then it actually makes
> sense, and a merge message like "Merge tag 'v2.6.36-rc7'" actually
> makes sense.
> 
> But "Merge branch 'linus-master'" just makes me (and anybody else) go
> "why did the security tree merge some random daily thing"?

The most common cases are to resolve a conflict, or to apply a patch which 
depends on something in your tree, neither of which are really directly 
associated with tags.


- 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/