[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200422134635.dk44a4zy2rz6p3d3@ca-dmjordan1.us.oracle.com>
Date: Wed, 22 Apr 2020 09:46:35 -0400
From: Daniel Jordan <daniel.m.jordan@...cle.com>
To: Sasha Levin <sashal@...nel.org>
Cc: Daniel Jordan <daniel.m.jordan@...cle.com>,
Herbert Xu <herbert@...dor.apana.org.au>,
Steffen Klassert <steffen.klassert@...unet.com>,
linux-crypto@...r.kernel.org, linux-kernel@...r.kernel.org,
stable@...r.kernel.org
Subject: Re: [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
Powered by blists - more mailing lists