stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: gregkh@linuxfoundation.org
Cc: jsnitsel@redhat.com, stefanb@linux.ibm.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is" failed to apply to 5.0-stable tree
Date: Tue, 23 Apr 2019 15:39:09 +0300	[thread overview]
Message-ID: <20190423123909.GA28540@linux.intel.com> (raw)
In-Reply-To: <1553163379222177@kroah.com>

On Thu, Mar 21, 2019 at 11:16:19AM +0100, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 5.0-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
> 
> thanks,
> 
> greg k-h

I responded to wrong email. This applies to v5.0:

$ git checkout v5.0.8
Checking out files: 100% (52753/52753), done.
Previous HEAD position was 6f7da290413b Linux 4.12
HEAD is now at 0b9132ee7429 Linux 5.0.8

$ git am -3 ~/Desktop/0001-tpm-tpm_i2c_atmel-Return-E2BIG-when-the-transfer-is-.patch
Applying: tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is incomplete

For me v4.4, yes there is a clear merge conflict.

/Jarkko

      reply	other threads:[~2019-04-23 12:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-21 10:16 FAILED: patch "[PATCH] tpm/tpm_i2c_atmel: Return -E2BIG when the transfer is" failed to apply to 5.0-stable tree gregkh
2019-04-23 12:39 ` Jarkko Sakkinen [this message]

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=20190423123909.GA28540@linux.intel.com \
    --to=jarkko.sakkinen@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jsnitsel@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=stefanb@linux.ibm.com \
    /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).