From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754250AbdBVGe5 (ORCPT ); Wed, 22 Feb 2017 01:34:57 -0500 Received: from www62.your-server.de ([213.133.104.62]:57377 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753635AbdBVGd7 (ORCPT ); Wed, 22 Feb 2017 01:33:59 -0500 Message-ID: <58AD30CF.6040507@iogearbox.net> Date: Wed, 22 Feb 2017 07:33:51 +0100 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 , Martin Schwidefsky , Heiko Carstens CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the net-next tree with the s390 tree References: <20170222101516.2f516e2d@canb.auug.org.au> In-Reply-To: <20170222101516.2f516e2d@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/22/2017 12:15 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/s390/net/bpf_jit_comp.c > > between commit: > > 9437964885f8 ("s390/bpf: remove redundant check for non-null image") > > from the s390 tree and commit: > > 9d876e79df6a ("bpf: fix unlocking of jited image when module ronx not set") > > 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, thanks!