From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753447AbdBVAGk (ORCPT ); Tue, 21 Feb 2017 19:06:40 -0500 Received: from ozlabs.org ([103.22.144.67]:59069 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752298AbdBVAGc (ORCPT ); Tue, 21 Feb 2017 19:06:32 -0500 Date: Wed, 22 Feb 2017 11:06:29 +1100 From: Stephen Rothwell To: Kees Cook , David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Laura Abbott , Daniel Borkmann Subject: linux-next: manual merge of the kspp tree with the net-next tree Message-ID: <20170222110629.53d01cf5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. I fixed it up (see above) 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. -- Cheers, Stephen Rothwell