22 Apr
2020
22 Apr
'20
1:46 p.m.
On Wed, Apr 22, 2020 at 01:27:02PM +0000, Sasha Levin wrote:
Hi
Hi!
v5.4.33: Failed to apply! Possible dependencies: bfcdcef8c8e3 ("padata: update documentation")
Yes, it's a trivial conflict in the header comment for padata_instance.
How should we proceed with this patch?
If mainline is ok with the change, I will send a 5.4-only version with the resolution.
By the way, I should not have cc'd stable on the email, it was picked up from the Cc: line in the patch.
Daniel