Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754194Ab2JaRGT (ORCPT ); Wed, 31 Oct 2012 13:06:19 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:58240 "EHLO e7.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752518Ab2JaRGS (ORCPT ); Wed, 31 Oct 2012 13:06:18 -0400 Date: Wed, 31 Oct 2012 12:04:06 -0500 From: Kent Yoder To: James Morris 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 Message-ID: <20121031170405.GA26935@ennui.austin.ibm.com> References: <20121030211613.GA15631@ennui.austin.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12103117-5806-0000-0000-00001B3E9235 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 947 Lines: 38 On Thu, Nov 01, 2012 at 02:56:14AM +1100, James Morris wrote: > 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. 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? Kent > > > > -- > 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/