From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Borkmann Subject: Re: linux-next: manual merge of the net-next tree with the net tree Date: Wed, 28 Jan 2015 09:39:12 +0100 Message-ID: <54C8A030.1000906@redhat.com> References: <20150128120214.3307aed8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko To: Stephen Rothwell Return-path: In-Reply-To: <20150128120214.3307aed8@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On 01/28/2015 02:02 AM, Stephen Rothwell wrote: ... > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, thanks!