From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932702AbcEQGF0 (ORCPT ); Tue, 17 May 2016 02:05:26 -0400 Received: from www62.your-server.de ([213.133.104.62]:46437 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754062AbcEQGFZ (ORCPT ); Tue, 17 May 2016 02:05:25 -0400 Message-ID: <573AB497.2020301@iogearbox.net> Date: Tue, 17 May 2016 08:05:11 +0200 From: Daniel Borkmann User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Stephen Rothwell , David Miller , netdev@vger.kernel.org, Catalin Marinas CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Shi , Will Deacon Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree References: <20160517102441.0cfbc192@canb.auug.org.au> In-Reply-To: <20160517102441.0cfbc192@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 05/17/2016 02:24 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/Kconfig > > between commit: > > 8ee708792e1c ("arm64: Kconfig: remove redundant HAVE_ARCH_TRANSPARENT_HUGEPAGE definition") > > from the arm64 tree and commit: > > 6077776b5908 ("bpf: split HAVE_BPF_JIT into cBPF and eBPF variant") > > from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. Diff looks good, thanks!