From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54538 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751295AbdJaQWZ (ORCPT ); Tue, 31 Oct 2017 12:22:25 -0400 Date: Tue, 31 Oct 2017 17:22:37 +0100 From: Greg KH To: Steven Rostedt Cc: stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] tracing/samples: Fix creation and deletion of" failed to apply to 4.9-stable tree Message-ID: <20171031162237.GA3035@kroah.com> References: <1508830886203218@kroah.com> <20171031114236.5e6fbaa5@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171031114236.5e6fbaa5@gandalf.local.home> Sender: stable-owner@vger.kernel.org List-ID: On Tue, Oct 31, 2017 at 11:42:36AM -0400, Steven Rostedt wrote: > > Below is the fix. The only conflict between 4.9 and Linus's tree was > that foo_bar_reg() changed from a void to returning int. > > Also, I folded in Linus's fix of having simple_thread_cnt be int and > not bool. You can remove that if you want to add Linus's commit on top. I would rather add Linus's commit on top, thanks. > I'm guessing this should also work for 4.4 as well? I'll try it after this next round of kernels are released, thanks. greg k-h