linux-kernel - Re: [PULL] IBM vTPM driver update

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.1211020256520.22272@tundra.namei.org>
Date:	Fri, 2 Nov 2012 02:57:56 +1100 (EST)
From:	James Morris <jmorris@...ei.org>
To:	Kent Yoder <key@...ux.vnet.ibm.com>
cc:	linux-kernel@...r.kernel.org,
	linux-security-module@...r.kernel.org,
	tpmdd-devel@...ts.sourceforge.net, benh@...nel.crashing.org,
	adlai@...ux.vnet.ibm.com
Subject: Re: [PULL] IBM vTPM driver update

On Wed, 31 Oct 2012, Kent Yoder wrote:

> > >   git://github.com/shpedoikal/linux.git tpmdd-v3.7-rc3
> > 
> > I get massive merge conflicts pulling this into my -next branch.
> 
>   I applied it to your master, I was hoping this could get in before 3.7
> is released. Is this the right way to go about this?

Nope, my 'master' tracks Linus.

Use the -next branch.

See http://kernsec.org/wiki/index.php/Kernel_Repository





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