From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932106AbdBVGiv (ORCPT ); Wed, 22 Feb 2017 01:38:51 -0500 Received: from www62.your-server.de ([213.133.104.62]:58054 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751349AbdBVGhq (ORCPT ); Wed, 22 Feb 2017 01:37:46 -0500 Message-ID: <58AD31B4.3040702@iogearbox.net> Date: Wed, 22 Feb 2017 07:37:40 +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: <20170222105132.4abc18e8@canb.auug.org.au> In-Reply-To: <20170222105132.4abc18e8@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:51 AM, Stephen Rothwell wrote: > Hi Kees, > > Today's linux-next merge of the kspp tree got a conflict in: > > arch/arm/Kconfig > > between commit: > > d2852a224050 ("arch: add ARCH_HAS_SET_MEMORY config") > > from the net-next tree and commit: > > ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common") > > from the kspp 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. Also looks good to me.