From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933010AbbDODYx (ORCPT ); Tue, 14 Apr 2015 23:24:53 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:42746 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932386AbbDODYo (ORCPT ); Tue, 14 Apr 2015 23:24:44 -0400 Date: Tue, 14 Apr 2015 23:24:40 -0400 (EDT) Message-Id: <20150414.232440.5065499008228520.davem@davemloft.net> To: rostedt@goodmis.org Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, emmanuel.grumbach@intel.com Subject: Re: linux-next: manual merge of the ftrace tree with the net-next tree From: David Miller In-Reply-To: <20150414230629.78b83480@grimm.local.home> References: <20150413175224.73a9baff@canb.auug.org.au> <20150415112323.057080ad@canb.auug.org.au> <20150414230629.78b83480@grimm.local.home> X-Mailer: Mew version 6.6 on Emacs 24.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Tue, 14 Apr 2015 20:24:43 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt Date: Tue, 14 Apr 2015 23:06:29 -0400 > I also noted this coming conflict in my pull request. So Linus should > be very well aware of it. > > https://lkml.org/lkml/2015/4/13/652 > > "Also there's a conflict with commit 7e1223b50089 ("iwlwifi: mvm: new > Alive / error table API") that Stephen found and he resolved it with > cd98c1ef4ec1a4d08e920060b70e47a5a4e69377." > > That is, if that commit sha1 still exists. I'll be sure to explain this to Linus.