From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751730AbdKFC4k (ORCPT ); Sun, 5 Nov 2017 21:56:40 -0500 Received: from ozlabs.org ([103.22.144.67]:39677 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641AbdKFC4i (ORCPT ); Sun, 5 Nov 2017 21:56:38 -0500 Date: Mon, 6 Nov 2017 13:56:36 +1100 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Dongjiu Geng Subject: linux-next: manual merge of the kvm-arm tree with Linus' tree Message-ID: <20171106135636.2958f4a3@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 kvm-arm tree got a conflict in: arch/arm64/kvm/inject_fault.c between commit: fd6c8c206fc5 ("arm/arm64: KVM: set right LR register value for 32 bit guest when inject abort") from Linus' tree and commit: 00586cdaf597 ("KVM: arm/arm64: Unify 32bit fault injection") from the kvm-arm tree. I fixed it up (I just used the latter) 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