linux-kernel - Re: [GIT] Security subsystem upate for 3.18

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.11.1410131502510.6957@namei.org>
Date:	Mon, 13 Oct 2014 15:06:34 +1100 (AEDT)
From:	James Morris <jmorris@...ei.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
cc:	Paul Moore <pmoore@...hat.com>,
	LSM List <linux-security-module@...r.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [GIT] Security subsystem upate for 3.18

On Sun, 12 Oct 2014, Linus Torvalds wrote:

> on some previous development, so it's often a good time to simply
> create a new feature branch. I don't know how James feels about
> merging multiple separate feature branches, but I know that *I* tend
> to appreciate it when I get multiple well-defined pull requests rather
> than one big one that does many different things.

It's fine with me.

This is the first time I saw (or noticed) that Paul had back merged ahead 
of me, but it seemed to merge into my tree ok so I didn't query it at the 
time.

Paul: it's likey best if you consider my -next branch as your upstream.  
I'll sync to Linus on point releases as previously discussed.

Linus: sorry about all of this, and I'll ensure there's always a summary 
of the changes and a correct subject for you.

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