Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423052Ab2JaQAf (ORCPT ); Wed, 31 Oct 2012 12:00:35 -0400 Received: from tundra.namei.org ([65.99.196.166]:54960 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935692Ab2JaQAd (ORCPT ); Wed, 31 Oct 2012 12:00:33 -0400 Date: Thu, 1 Nov 2012 02:56:14 +1100 (EST) From: James Morris To: Kent Yoder cc: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, tpmdd-devel@lists.sourceforge.net, benh@kernel.crashing.org, adlai@linux.vnet.ibm.com Subject: Re: [PULL] IBM vTPM driver update In-Reply-To: <20121030211613.GA15631@ennui.austin.ibm.com> Message-ID: References: <20121030211613.GA15631@ennui.austin.ibm.com> User-Agent: Alpine 2.02 (LRH 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 699 Lines: 29 On Tue, 30 Oct 2012, Kent Yoder wrote: > Hi James, > > Please pull as an update for 3.7. > > Thanks, > Kent > > The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64: > > Linux 3.7-rc3 (2012-10-28 12:24:48 -0700) > > are available in the git repository at: > > git://github.com/shpedoikal/linux.git tpmdd-v3.7-rc3 I get massive merge conflicts pulling this into my -next branch. -- James Morris -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/