From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752701AbcD2AAE (ORCPT ); Thu, 28 Apr 2016 20:00:04 -0400 Received: from ozlabs.org ([103.22.144.67]:60966 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752135AbcD2AAB (ORCPT ); Thu, 28 Apr 2016 20:00:01 -0400 Date: Fri, 29 Apr 2016 09:59:58 +1000 From: Stephen Rothwell To: Catalin Marinas Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sudeep Holla , Christoffer Dall , AKASHI Takahiro , Will Deacon Subject: linux-next: manual merge of the arm64 tree with Linus' tree Message-ID: <20160429095958.007976da@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 Catalin, Today's linux-next merge of the arm64 tree got a conflict in: arch/arm/kvm/arm.c between commit: 06a71a24bae5 ("arm64: KVM: unregister notifiers in hyp mode teardown path") from Linus' tree and commit: 67f691976662 ("arm64: kvm: allows kvm cpu hotplug") from the arm64 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/arm/kvm/arm.c index dded1b763c16,1687e1450c3a..000000000000 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@@ -1198,8 -1226,6 +1233,7 @@@ static void teardown_hyp_mode(void free_hyp_pgds(); for_each_possible_cpu(cpu) free_page(per_cpu(kvm_arm_hyp_stack_page, cpu)); - unregister_cpu_notifier(&hyp_init_cpu_nb); + hyp_cpu_pm_exit(); } static int init_vhe_mode(void)