On Thu, Aug 07, 2025 at 02:34:10PM +0200, Markus Blöchl wrote:
Hi Sasha,
Sorry, I don't really know how to handle this response from your bot:
On Fri, Jul 25, 2025 at 09:37:11PM -0400, Sasha Levin wrote:
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues: ❌ Patch application failures detected ⚠️ Found matching upstream commit but patch is missing proper reference to it
The patch clearly mentions `commit a5a441ae283d upstream.` to me. Am I too blind to spot a typo or similar?
It should be the fully 40 char sha1, not a shortened version.
Found matching upstream commit: a5a441ae283d54ec329aadc7426991dc32786d52
WARNING: Author mismatch between patch and found commit: Backport author: Markus Blöchl markus@blochl.de Commit author: Anton Nadezhdin anton.nadezhdin@intel.com
This mismatch is intentional. I did not author the original fix. I merely backported it to 6.12.y. So I kept the original author when cherry-picking.
That ok, it's mostly just a warning for us to see if we need to get additional acks or do a more careful review.
Note: Could not generate a diff with upstream commit:
Note: Could not generate diff - patch failed to apply for comparison
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | origin/linux-6.15.y | Failed | N/A | | origin/linux-6.12.y | Success | Success | | origin/linux-6.6.y | Failed | N/A | | origin/linux-6.1.y | Failed | N/A | | origin/linux-5.15.y | Failed | N/A | | origin/linux-5.10.y | Failed | N/A | | origin/linux-5.4.y | Failed | N/A |
As written, the backport is for 6.12.y only.
Normally you'd indicate which trees you want the patch to be applied to in the subject line. In this case it would be something like:
[PATCH 6.12] ice/ptp: fix crosstimestamp reporting