On Thu, Mar 21, 2019 at 11:16:19AM +0100, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>. > > 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
