From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754333AbdBVGgk (ORCPT ); Wed, 22 Feb 2017 01:36:40 -0500 Received: from www62.your-server.de ([213.133.104.62]:57768 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753635AbdBVGgK (ORCPT ); Wed, 22 Feb 2017 01:36:10 -0500 Message-ID: <58AD3120.7020300@iogearbox.net> Date: Wed, 22 Feb 2017 07:35:12 +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 , Kees Cook , David Miller , Networking CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Laura Abbott Subject: Re: linux-next: manual merge of the kspp tree with the net-next tree References: <20170222110629.53d01cf5@canb.auug.org.au> In-Reply-To: <20170222110629.53d01cf5@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 01:06 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kspp tree got a conflict in: > > include/linux/filter.h > > between commit: > > 9d876e79df6a ("bpf: fix unlocking of jited image when module ronx not set") > > from the net-next tree and commit: > > 0f5bf6d0afe4 ("arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX") > > from the kspp tree. > > Hmmm, both these change the ifdef guards I have used the one from the > net-next tree (CONFIG_ARCH_HAS_SET_MEMORY) for today, please let me know > if that is not correct. That's fine, thanks!