Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 22 Apr 2020 09:46:35 -0400
From:   Daniel Jordan <daniel.m.jordan@oracle.com>
To:     Sasha Levin <sashal@kernel.org>
Cc:     Daniel Jordan <daniel.m.jordan@oracle.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        Steffen Klassert <steffen.klassert@secunet.com>,
        linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org
Subject: Re: [PATCH] padata: add separate cpuhp node for CPUHP_PADATA_DEAD
Message-ID: <20200422134635.dk44a4zy2rz6p3d3@ca-dmjordan1.us.oracle.com>
References: <20200421163455.2177998-1-daniel.m.jordan@oracle.com>
 <20200422132702.DCAA7206EC@mail.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200422132702.DCAA7206EC@mail.kernel.org>
User-Agent: NeoMutt/20180716
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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