From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756285AbcI0Dqw (ORCPT ); Mon, 26 Sep 2016 23:46:52 -0400 Received: from ozlabs.org ([103.22.144.67]:60799 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755546AbcI0Dqe (ORCPT ); Mon, 26 Sep 2016 23:46:34 -0400 Date: Tue, 27 Sep 2016 13:46:31 +1000 From: Stephen Rothwell To: Christoffer Dall , Marc Zyngier , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Thompson Subject: linux-next: manual merge of the kvm-arm tree with the tip tree Message-ID: <20160927134631.40e04c2a@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/arm/include/asm/arch_gicv3.h between commit: 91ef84428a86 ("irqchip/gic-v3: Reset BPR during initialization") from the tip tree and commit: 3d9cd95f90b2 ("ARM: gic-v3: Work around definition of gic_write_bpr1") from the kvm-arm tree. I fixed it up (I just used the kvm-arm tree version) 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