tpmdd-devel.lists.sourceforge.net archive mirror
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Josh Zimmerman <joshz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org,
	jmorris-gx6/JNMH7DfYtjvyW6yDsg@public.gmane.org
Subject: Re: [PATCH v5 2/2] Add "shutdown" to "struct class".
Date: Fri, 16 Jun 2017 11:14:52 +0200	[thread overview]
Message-ID: <20170616091452.txun2l3zni2zz7ne@intel.com> (raw)
In-Reply-To: <20170616085747.c2wkkgsdjuyju6vm-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

On Fri, Jun 16, 2017 at 10:57:47AM +0200, Jarkko Sakkinen wrote:
> On Thu, Jun 01, 2017 at 09:33:43AM -0700, Josh Zimmerman wrote:
> > The TPM class has some common shutdown code that must be executed for
> > all drivers. This adds some needed functionality for that.
> > 
> > Signed-off-by: Josh Zimmerman <joshz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
> > Acked-by: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
> > Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> > 
> > -----
> > v2: Add Signed-off-by.
> > v3: Remove logically separate change.
> > v4: Add "acked-by" and "cc".
> > v5: Execute only one of the class/bus/driver's shutdown functions.
> 
> This breaks the patch.
> 
> > ---
> 
> The changelog should be here.
> 
> >  drivers/base/core.c    | 6 +++++-
> >  include/linux/device.h | 2 ++
> >  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> /Jarkko


It actually doesn't probably break the patch because there are six
dashes but is incorrectly positioned. You should but right before
diffstat after three dashes. Git will ignore this part.

Still getting this:

$ git am -3 ~/Downloads/josh.patch
Applying: Add "shutdown" to "struct class".
error: patch fragment without header at line 36: @@ -407,6 +408,7 @@ struct class {
error: could not build fake ancestor
Patch failed at 0001 Add "shutdown" to "struct class".
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Look at the comment at the lie 1549:

https://github.com/git/git/blob/master/apply.c

I have no idea how you have exported and sent it but I would recommend
to use standard git format-patch and git send-email commands to ensure
the correct results.

Please send the full patch set once you know it will cleanly apply.

You could email it to yourself or some collegue and ask them to apply
it as a test measure...

/Jarkko

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

  parent reply	other threads:[~2017-06-16  9:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-01 16:33 [PATCH v5 2/2] Add "shutdown" to "struct class" Josh Zimmerman
     [not found] ` <CAHSjozA+xfUM-NmbP7Kb5B=T+u6qaEFzMWeF6OxX2N7-xHLAVQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-06-01 16:39   ` Jason Gunthorpe
     [not found]     ` <20170601163905.GA2694-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-06-01 16:55       ` Josh Zimmerman
     [not found]         ` <CAHSjozBfU0Lmp_SnA5GcmACWxG4E1NdEcb9v7gcs5CLREuRNUA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-06-01 17:04           ` Jason Gunthorpe
2017-06-16  8:57   ` Jarkko Sakkinen
     [not found]     ` <20170616085747.c2wkkgsdjuyju6vm-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-06-16  9:14       ` Jarkko Sakkinen [this message]
     [not found]         ` <20170616091452.txun2l3zni2zz7ne-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-06-16 18:31           ` Josh Zimmerman via tpmdd-devel

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=20170616091452.txun2l3zni2zz7ne@intel.com \
    --to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
    --cc=jmorris-gx6/JNMH7DfYtjvyW6yDsg@public.gmane.org \
    --cc=joshz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
    --cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
    /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;
as well as URLs for NNTP newsgroup(s).