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
Date: Wed, 22 Apr 2020 09:46:35 -0400 [thread overview]
Message-ID: <20200422134635.dk44a4zy2rz6p3d3@ca-dmjordan1.us.oracle.com> (raw)
In-Reply-To: <20200422132702.DCAA7206EC@mail.kernel.org>
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
next prev parent reply other threads:[~2020-04-22 13:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 16:34 [PATCH] padata: add separate cpuhp node for CPUHP_PADATA_DEAD Daniel Jordan
2020-04-22 13:27 ` Sasha Levin
2020-04-22 13:46 ` Daniel Jordan [this message]
2020-04-30 5:29 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422134635.dk44a4zy2rz6p3d3@ca-dmjordan1.us.oracle.com \
--to=daniel.m.jordan@oracle.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).