[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 2a5db859c6825b5d50377dda9c3cc729c20cad43
WARNING: Author mismatch between patch and upstream commit:
Backport author: Leah Rumancik<leah.rumancik@xxxxxxxxx>
Commit author: Long Li<leo.lilong@xxxxxxxxxx>
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (different SHA1: 23f3d79fc983)
6.1.y | Present (different SHA1: d28caa7f7c3b)
Note: The patch differs from the upstream commit:
---
1: 2a5db859c6825 ! 1: 79526dfb16ec1 xfs: factor out xfs_defer_pending_abort
@@ Metadata
## Commit message ##
xfs: factor out xfs_defer_pending_abort
+ [ Upstream commit 2a5db859c6825b5d50377dda9c3cc729c20cad43 ]
+
Factor out xfs_defer_pending_abort() from xfs_defer_trans_abort(), which
not use transaction parameter, so it can be used after the transaction
life cycle.
@@ Commit message
Signed-off-by: Long Li <leo.lilong@xxxxxxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Signed-off-by: Chandan Babu R <chandanbabu@xxxxxxxxxx>
+ Signed-off-by: Leah Rumancik <leah.rumancik@xxxxxxxxx>
## fs/xfs/libxfs/xfs_defer.c ##
@@ fs/xfs/libxfs/xfs_defer.c: xfs_defer_create_intents(
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
