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 <jo...@google.com>
> > Acked-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
> > Cc: sta...@vger.kernel.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
_______________________________________________
tpmdd-devel mailing list
tpmdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
