From: Greg KH <gregkh@linuxfoundation.org>
To: Oleg Nesterov <oleg@redhat.com>
Cc: long7573@126.com, torvalds@linux-foundation.org, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] epoll: fix race between ep_poll_callback(POLLFREE) and" failed to apply to 4.12-stable tree
Date: Mon, 4 Sep 2017 18:14:10 +0200 [thread overview]
Message-ID: <20170904161410.GA12608@kroah.com> (raw)
In-Reply-To: <20170904132314.GA30065@redhat.com>
On Mon, Sep 04, 2017 at 03:23:14PM +0200, Oleg Nesterov wrote:
> On 09/04, gregkh@linuxfoundation.org wrote:
> >
> > The patch below does not apply to the 4.12-stable tree.
>
> trivial conflict with commit 2055da97389a605c8a00d163d40903afbe413921
> "sched/wait: Disambiguate wq_entry->task_list and wq_head->task_list naming",
> wait->task_list was renamed to ->entry.
>
> > 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>.
>
> See below, or should I send the patch separately?
As you did here was great, thanks for this, and the 3 other backports,
all now queued up.
greg k-h
prev parent reply other threads:[~2017-09-04 16:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 10:36 FAILED: patch "[PATCH] epoll: fix race between ep_poll_callback(POLLFREE) and" failed to apply to 4.12-stable tree gregkh
2017-09-04 13:23 ` Oleg Nesterov
2017-09-04 16:14 ` Greg KH [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=20170904161410.GA12608@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=long7573@126.com \
--cc=oleg@redhat.com \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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