From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753048AbcBZAPK (ORCPT ); Thu, 25 Feb 2016 19:15:10 -0500 Received: from www62.your-server.de ([213.133.104.62]:41548 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752119AbcBZAPH (ORCPT ); Thu, 25 Feb 2016 19:15:07 -0500 Message-ID: <56CF9905.7080508@iogearbox.net> Date: Fri, 26 Feb 2016 01:15:01 +0100 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Stephen Rothwell , David Miller , netdev@vger.kernel.org CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexei Starovoitov Subject: Re: linux-next: manual merge of the net-next tree with the net tree References: <20160226111314.5b94099c@canb.auug.org.au> In-Reply-To: <20160226111314.5b94099c@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/26/2016 01:13 AM, Stephen Rothwell wrote: [...] > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good to me, thanks Stephen! Best, Daniel