From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbcGSBDw (ORCPT ); Mon, 18 Jul 2016 21:03:52 -0400 Received: from ozlabs.org ([103.22.144.67]:33120 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbcGSBDu (ORCPT ); Mon, 18 Jul 2016 21:03:50 -0400 Date: Tue, 19 Jul 2016 11:03:47 +1000 From: Stephen Rothwell To: Herbert Xu , Scott Wood Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christophe Leroy , Michael Ellerman , Benjamin Herrenschmidt , Subject: linux-next: manual merge of the crypto tree with the fsl tree Message-ID: <20160719110347.1abfa9a3@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 Herbert, Today's linux-next merge of the crypto tree got a conflict in: arch/powerpc/Kconfig between commit: c223c90386bc ("powerpc32: provide VIRT_CPU_ACCOUNTING") from the fsl tree and commit: 377ca89f0b37 ("powerpc: Add module autoloading based on CPU features") from the crypto 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/powerpc/Kconfig index fcfe5332416f,174f1e8f9cac..000000000000 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@@ -165,7 -164,7 +165,8 @@@ config PP select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS + select HAVE_VIRT_CPU_ACCOUNTING + select GENERIC_CPU_AUTOPROBE config GENERIC_CSUM def_bool CPU_LITTLE_ENDIAN