Received-SPF: pass (google.com: domain of linux-kernel+bounces-193193-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Wed, 29 May 2024 01:41:04 +0300
Message-Id: <D1LN1FCKDWHR.2VZQY8BBBCSIJ@kernel.org>
Subject: Re: linux-next: duplicate patch in the tpmdd tree
From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>, "Linux Next
 Mailing List" <linux-next@vger.kernel.org>
References: <20240529081930.487f7290@canb.auug.org.au>
In-Reply-To: <20240529081930.487f7290@canb.auug.org.au>

On Wed May 29, 2024 at 1:19 AM EEST, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different
> commit (but the same patch):
>
>   7df9ef4f7b1e ("tpm_tis_spi: Account for SPI header when allocating TPM =
SPI xfer buffer")

Sorry it was my fault forgot to update 'next'.

Now it should be fixed.

I verified this also by rebasing Linus' tree, which went cleanly
and git push origin next did not require '-f', so hopefully now
all is good...

BR, Jarkko