Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1431146

Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors

Show all headers | View raw

On Fri, Jun 24, 2016 at 02:26:15PM -0600, Jason Gunthorpe wrote:
> 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 :)

For 4.6 I used pull request with a signed tag and everything went quite
well.

For 4.7 I did re-read the whole development process documentation but it
only speaks about pull requests and does not clearly state what you just
stated.

To summarize I screwed this one up but I guess the only big harm is that
vTPM support will skip to 4.8. I guess not big harm done?

My master is now rebased and this is what I get:

$ git log --oneline security/next...master | wc -l
67

I don't think that is too bad.

> Jason

/Jarkko

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-06-24 20:30 +0200
  Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-06-24 22:30 +0200
    Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-06-24 22:30 +0200
      Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-06-25 17:30 +0200
        Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-06-25 17:50 +0200
          Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jason Gunthorpe <jgunthorpe@obsidianresearch.com> - 2016-06-27 20:00 +0200
    Re: [PATCH v8 1/5] tpm_tis: Improve reporting of IO errors Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> - 2016-06-24 22:30 +0200

csiph-web