Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752698AbdGCHy7 (ORCPT ); Mon, 3 Jul 2017 03:54:59 -0400 Received: from www62.your-server.de ([213.133.104.62]:41085 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752555AbdGCHy5 (ORCPT ); Mon, 3 Jul 2017 03:54:57 -0400 Message-ID: <5959F84A.8040808@iogearbox.net> Date: Mon, 03 Jul 2017 09:54:50 +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 , Networking , Catalin Marinas CC: Linux-Next Mailing List , Linux Kernel Mailing List , Luc Van Oostenryck , Will Deacon Subject: Re: linux-next: manual merge of the net-next tree with the arm64 tree References: <20170703113732.6af8235d@canb.auug.org.au> In-Reply-To: <20170703113732.6af8235d@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 Content-Length: 823 Lines: 25 On 07/03/2017 03:37 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/net/bpf_jit_comp.c > > between commit: > > 425e1ed73e65 ("arm64: fix endianness annotation for 'struct jit_ctx' and friends") > > from the arm64 tree and commit: > > f1c9eed7f437 ("bpf, arm64: take advantage of stack_depth tracking") > > 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. Looks good to me, thanks!