From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753451AbaATJZp (ORCPT ); Mon, 20 Jan 2014 04:25:45 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:37386 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753068AbaATJZl (ORCPT ); Mon, 20 Jan 2014 04:25:41 -0500 MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: <1390209434.5483.26.camel@marge.simpson.net> References: <20140116145829.5e4fcab103b1c5c77501ee77@canb.auug.org.au> <20140116121955.GQ31570@twins.programming.kicks-ass.net> <20140117074628.88698f59939c9002b7c12968@canb.auug.org.au> <20140116222536.GX30183@twins.programming.kicks-ass.net> <20140117093426.ee8e3d1bb2e95c9f67ec625b@canb.auug.org.au> <52D8625C.1000902@zytor.com> <20140117144518.231fa4bccb16a8d7edd36662@canb.auug.org.au> <1390038366.5676.10.camel@marge.simpson.net> <20140120145122.a95b3e3a17d20117214098ca@canb.auug.org.au> <1390209434.5483.26.camel@marge.simpson.net> Date: Mon, 20 Jan 2014 10:25:39 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the tip tree From: Sedat Dilek To: Mike Galbraith Cc: Stephen Rothwell , "H. Peter Anvin" , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Len Brown , linux-next , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 20, 2014 at 10:17 AM, Mike Galbraith wrote: > On Mon, 2014-01-20 at 09:42 +0100, Sedat Dilek wrote: >> On Mon, Jan 20, 2014 at 4:51 AM, Stephen Rothwell wrote: >> > On Sat, 18 Jan 2014 10:46:06 +0100 Mike Galbraith wrote: >> >> >> >> I hope it doesn't look quite like that, next-20140117 is -ENOBOOT on >> >> Q6600 box. See below for an alternative. >> >> >> >> idle: kill unnecessary mwait_idle() resched IPIs >> > >> > OK, so despite even further discussion, I have applied this as a merge >> > fix patch for today. Let me know when it is all sorted out. >> > >> >> Where is this fix? > > If you pull next-20140120, the fix is in it. > >> ( Browsing Linux-next remote GIT repository online. ) >> 2x NOPE for me. > > Probably because it's a temporary conflict fix. > It's about the handling of fixes for -next. For such kind of "special" tweaks Stephen introduced *next-fixes* (see his email on linux-next ML and [1]). Such make-my-system-boot-again and other critical fixes belong there. BTW, I found the merge hunk (see my other email). - Sedat - [1] http://git.kernel.org/cgit/linux/kernel/git/sfr/next-fixes.git