From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754214AbdIEF1b (ORCPT ); Tue, 5 Sep 2017 01:27:31 -0400 Received: from ozlabs.org ([103.22.144.67]:51931 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953AbdIEF12 (ORCPT ); Tue, 5 Sep 2017 01:27:28 -0400 Date: Tue, 5 Sep 2017 15:27:25 +1000 From: Stephen Rothwell To: Andrew Morton , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Varsha Rao , Pablo Neira Ayuso , Krzysztof Kozlowski Subject: linux-next: manual merge of the akpm-current tree with the net-next tree Message-ID: <20170905152725.4ae867b6@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 Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/sh/configs/se7751_defconfig between commit: 9efdb14f76f4 ("net: Remove CONFIG_NETFILTER_DEBUG and _ASSERT() macros.") from the net-next tree and commit: a83883ff2285 ("sh: defconfig: cleanup from old Kconfig options") from the akpm-current 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. -- Cheers, Stephen Rothwell diff --cc arch/sh/configs/se7751_defconfig index 56b5e4ce8d4a,153e1d3c8be5..000000000000 --- a/arch/sh/configs/se7751_defconfig +++ b/arch/sh/configs/se7751_defconfig @@@ -25,12 -24,10 +24,9 @@@ CONFIG_IP_PNP= CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y - # CONFIG_INET_LRO is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y - CONFIG_IP_NF_QUEUE=y -CONFIG_NETFILTER_DEBUG=y CONFIG_MTD=y - CONFIG_MTD_PARTITIONS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y