From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535Ab1BQJXe (ORCPT ); Thu, 17 Feb 2011 04:23:34 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:37796 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095Ab1BQJXb (ORCPT ); Thu, 17 Feb 2011 04:23:31 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=ocWddVqdU7Il9/X0T9tEB792mIHq/XDJFrder2caBkvuGQsimXrRPzj6mVJOZLuQj/ 6oSCQVvRA/Jt1bZ2iEjNyuKR55BoZZMCcZ34S11jAmYijBv0jTkAfuQn6ivUVgtrbh4y 99Ik9x3jVlqON6UNS/pNtg8zBm3EGACSYm5ek= Date: Thu, 17 Feb 2011 10:23:26 +0100 From: Tejun Heo To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: build failure after merge of the workqueues tree Message-ID: <20110217092326.GM19830@htj.dyndns.org> References: <20110217143321.78f52ec5.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110217143321.78f52ec5.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On Thu, Feb 17, 2011 at 02:33:21PM +1100, Stephen Rothwell wrote: > Caused by commit 58a69cb47ec6991bf006a3e5d202e8571b0327a4 ("workqueue, > freezer: unify spelling of 'freeze' + 'able' to 'freezable'") being > mismerged with commit 4149efb22da66e326fc48baf80d628834509f7f0 > ("workqueue: add system_freezeable_wq") which added another use of > WQ_FREEZEABLE. > > Please do at least simple build testing before submitting to > linux-next ... Yeap, please feel free to call me an idiot. After verifying the original branch, I completely forgot merge could introduce this type of silent conflicts. I apologize for the late screwups. Thank you. -- tejun