From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: linux-next: manual merge of the ftrace tree with the net-next tree Date: Tue, 14 Apr 2015 22:39:22 -0400 (EDT) Message-ID: <20150414.223922.1154268765754293847.davem@davemloft.net> References: <20150413175224.73a9baff@canb.auug.org.au> <20150415112323.057080ad@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: rostedt@goodmis.org, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, emmanuel.grumbach@intel.com To: sfr@canb.auug.org.au Return-path: In-Reply-To: <20150415112323.057080ad@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-Id: netdev.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.