From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751655AbcFXU04 (ORCPT ); Fri, 24 Jun 2016 16:26:56 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:60456 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751175AbcFXU0y (ORCPT ); Fri, 24 Jun 2016 16:26:54 -0400 Date: Fri, 24 Jun 2016 14:26:15 -0600 From: Jason Gunthorpe To: Jarkko Sakkinen Cc: Ed Swierk , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, stefanb@us.ibm.com Subject: Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Message-ID: <20160624202615.GA2968@obsidianresearch.com> References: <1466474042-110773-1-git-send-email-eswierk@skyportsystems.com> <1466557831-113440-1-git-send-email-eswierk@skyportsystems.com> <1466557831-113440-2-git-send-email-eswierk@skyportsystems.com> <20160624182515.GC14506@obsidianresearch.com> <20160624202131.GB8399@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160624202131.GB8399@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.160 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 24, 2016 at 11:21:31PM +0300, Jarkko Sakkinen wrote: > Hmm... Do you mean by 4 month old stuff the stuff that is in mainline > and not in my master branch? I mean the stuff that is in your branch but not in mainline. $ git log --pretty=oneline jarkko/master ^v4.7-rc3 | wc -l 73 > I'm not sure what happened with 4.7. I merged the changes for in about > 4.6-rc5. There was one issue that I fixed that Stephen reported. > > At the moment linux-next seems contain the stuff that I have in my > next. linux-next is just pulling directly from your tree, you still have to ensure that James gets and processes your pull request during the merge window. If he dropped a pull request you should follow up and ask why, if you never sent one then ... oops :) Jason