lkml.org 
[lkml]   [2020]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] padata: add separate cpuhp node for CPUHP_PADATA_DEAD
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

\
 
 \ /
  Last update: 2020-04-22 15:47    [W:0.048 / U:0.368 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site