stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: gregkh@linuxfoundation.org
Cc: dhowells@redhat.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] afs: Fix some tracing details" failed to apply to 4.14-stable tree
Date: Mon, 30 Mar 2020 12:18:17 -0400	[thread overview]
Message-ID: <20200330161817.GI4189@sasha-vm> (raw)
In-Reply-To: <1585575122165119@kroah.com>

On Mon, Mar 30, 2020 at 03:32:02PM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.14-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 4636cf184d6d9a92a56c2554681ea520dd4fe49a Mon Sep 17 00:00:00 2001
>From: David Howells <dhowells@redhat.com>
>Date: Fri, 13 Mar 2020 13:36:01 +0000
>Subject: [PATCH] afs: Fix some tracing details
>
>Fix a couple of tracelines to indicate the usage count after the atomic op,
>not the usage count before it to be consistent with other afs and rxrpc
>trace lines.
>
>Change the wording of the afs_call_trace_work trace ID label from "WORK" to
>"QUEUE" to reflect the fact that it's queueing work, not doing work.
>
>Fixes: 341f741f04be ("afs: Refcount the afs_call struct")
>Signed-off-by: David Howells <dhowells@redhat.com>

Conflict with f044c8847bb6 ("afs: Lay the groundwork for supporting
network namespaces"). I've fixed and queued it up.

-- 
Thanks,
Sasha

      reply	other threads:[~2020-03-30 16:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-30 13:32 FAILED: patch "[PATCH] afs: Fix some tracing details" failed to apply to 4.14-stable tree gregkh
2020-03-30 16:18 ` Sasha Levin [this message]

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=20200330161817.GI4189@sasha-vm \
    --to=sashal@kernel.org \
    --cc=dhowells@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=stable@vger.kernel.org \
    /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).