From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59868 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764AbdIDQOJ (ORCPT ); Mon, 4 Sep 2017 12:14:09 -0400 Date: Mon, 4 Sep 2017 18:14:10 +0200 From: Greg KH To: Oleg Nesterov 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 Message-ID: <20170904161410.GA12608@kroah.com> References: <150452136492112@kroah.com> <20170904132314.GA30065@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170904132314.GA30065@redhat.com> Sender: stable-owner@vger.kernel.org List-ID: 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 . > > 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