From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754983AbcGZGp7 (ORCPT ); Tue, 26 Jul 2016 02:45:59 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36128 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbcGZGpz (ORCPT ); Tue, 26 Jul 2016 02:45:55 -0400 Date: Tue, 26 Jul 2016 08:45:51 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Linus Torvalds , linux-kernel@vger.kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , Thomas Gleixner , Andrew Morton Subject: Re: [GIT PULL] perf changes for v4.8 Message-ID: <20160726064551.GA26401@gmail.com> References: <20160725082838.GA16210@gmail.com> <20160725235330.07c231a3@canb.auug.org.au> <20160725151520.GA5030@gmail.com> <20160725153536.GA5715@gmail.com> <20160726072123.497240f2@canb.auug.org.au> <20160726075324.0aa6c782@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160726075324.0aa6c782@canb.auug.org.au> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > > > That is why I sent this without mentioning the conflict. Is there any other > > > complication that I missed? > > > > Actually, the perf tree on its own was enough to trigger the build problem, > > the luto-next tree was just what initially triggered the build failure in > > linux-next (I guess there is some missing dependency). After the build failed, > > I started including the perf tree directly before the tip tree and the build > > would fail when I merged that ... > > Now that this is fixed and merged into the tip tree, I have removed the perf > tree from linux-next. Ok, thanks - and sorry about this - I'll get the tooling fixes to Linus ASAP. Thanks, Ingo