From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755543Ab1KXKMU (ORCPT ); Thu, 24 Nov 2011 05:12:20 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:55595 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755393Ab1KXKMT (ORCPT ); Thu, 24 Nov 2011 05:12:19 -0500 From: "Rafael J. Wysocki" To: Tejun Heo Subject: Re: linux-next: build failure after merge of the final tree (pm tree related) Date: Thu, 24 Nov 2011 11:15:05 +0100 User-Agent: KMail/1.13.6 (Linux/3.1.0-rc10+; KDE/4.6.0; x86_64; ; ) Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org References: <20111114142423.fe126b8c8cfd275d7dd138cc@canb.auug.org.au> <20111124171949.994860621f4f83a650cf9b5b@canb.auug.org.au> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201111241115.05836.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday, November 24, 2011, Tejun Heo wrote: > Hello, > > On Wed, Nov 23, 2011 at 10:19 PM, Stephen Rothwell wrote: > >> > Subject: [PATCH] freezer: fix more fallout from the thaw_process rename > >> > > >> > Commit 944e192db53c "freezer: rename thaw_process() to __thaw_task() > >> > and simplify the implementation" did not create a !CONFIG_FREEZER version > >> > of __thaw_task(). > >> > > >> > Signed-off-by: Stephen Rothwell > >> > >> I've applied your patch to linux-pm/pm-freezer and merged it into > >> linux-pm/linux-next. > > Ah.. that's my bad. I was actually looking at that diff and somehow it > just slipped my mind. Rafael, can you please apply Stephen's patch on > top of pm-freezer? Sure, I will do that later today. Thanks, Rafael