From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249AbeBZJES (ORCPT ); Mon, 26 Feb 2018 04:04:18 -0500 Received: from www62.your-server.de ([213.133.104.62]:41425 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751778AbeBZJEA (ORCPT ); Mon, 26 Feb 2018 04:04:00 -0500 Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree To: Stephen Rothwell , Alexei Starovoitov , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List References: <20180226114147.2ab5c647@canb.auug.org.au> From: Daniel Borkmann Message-ID: <0df3cf32-9f64-b0f0-3a1c-00c1ab52c939@iogearbox.net> Date: Mon, 26 Feb 2018 10:03:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20180226114147.2ab5c647@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US 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/2018 01:41 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the bpf-next tree got a conflict in: > > tools/testing/selftests/bpf/test_verifier.c > > between commit: > > ca36960211eb ("bpf: allow xadd only on aligned memory") > > from the bpf tree and commit: > > 23d191a82c13 ("bpf: add various jit test cases") > > from the bpf-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, thanks!