From: Kent Yoder <key@linux.vnet.ibm.com>
To: James Morris <jmorris@namei.org>
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
Date: Wed, 31 Oct 2012 12:04:06 -0500 [thread overview]
Message-ID: <20121031170405.GA26935@ennui.austin.ibm.com> (raw)
In-Reply-To: <alpine.LRH.2.02.1211010255350.12284@tundra.namei.org>
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
> <jmorris@namei.org>
>
next prev parent reply other threads:[~2012-10-31 17:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 21:16 Kent Yoder
2012-10-31 15:56 ` James Morris
2012-10-31 17:04 ` Kent Yoder [this message]
2012-11-01 15:57 ` James Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121031170405.GA26935@ennui.austin.ibm.com \
--to=key@linux.vnet.ibm.com \
--cc=adlai@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome