Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761583Ab3JPUG7 (ORCPT ); Wed, 16 Oct 2013 16:06:59 -0400 Received: from merlin.infradead.org ([205.233.59.134]:36076 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760584Ab3JPUG5 (ORCPT ); Wed, 16 Oct 2013 16:06:57 -0400 Date: Wed, 16 Oct 2013 22:06:45 +0200 From: Peter Zijlstra To: Thierry Reding Cc: Shaohua Li , NeilBrown , Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the tip tree Message-ID: <20131016200645.GD10651@twins.programming.kicks-ass.net> References: <1381949500-501-1-git-send-email-treding@nvidia.com> <1381949500-501-2-git-send-email-treding@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1381949500-501-2-git-send-email-treding@nvidia.com> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 551 Lines: 14 On Wed, Oct 16, 2013 at 08:51:39PM +0200, Thierry Reding wrote: > Today's linux-next merge of the tip tree got a conflict in > > include/linux/wait.h > > caused by commits 1ab2460 (wait: add wait_event_cmd()) and fb869b6 > (sched/wait: Clean up wait.h details a bit). Gargh, where did that come from?! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/