From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932369AbbDOCjc (ORCPT ); Tue, 14 Apr 2015 22:39:32 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:42369 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932157AbbDOCjX (ORCPT ); Tue, 14 Apr 2015 22:39:23 -0400 Date: Tue, 14 Apr 2015 22:39:22 -0400 (EDT) Message-Id: <20150414.223922.1154268765754293847.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: rostedt@goodmis.org, 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: <20150415112323.057080ad@canb.auug.org.au> References: <20150413175224.73a9baff@canb.auug.org.au> <20150415112323.057080ad@canb.auug.org.au> 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 19:39:23 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell Date: Wed, 15 Apr 2015 11:23:23 +1000 > This patch is now needed when the net-next tree is merged with Linus' > tree ... Yeah I noticed this while working on test merges into Linus's tree, thanks.