Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753844AbcCBDfK (ORCPT ); Tue, 1 Mar 2016 22:35:10 -0500 Received: from ozlabs.org ([103.22.144.67]:56834 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356AbcCBDfI (ORCPT ); Tue, 1 Mar 2016 22:35:08 -0500 Date: Wed, 2 Mar 2016 14:35:06 +1100 From: Stephen Rothwell To: Greg KH , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "J. German Rivera" , Qais Yousef Subject: linux-next: manual merge of the staging tree with the tip tree Message-ID: <20160302143506.5f75d279@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 Content-Length: 746 Lines: 36 Hi Greg, Today's linux-next merge of the staging tree got a conflict in: include/linux/irqdomain.h between commit: 29d5c8db26ad ("genirq: Add DOMAIN_BUS_IPI") from the tip tree and commit: 9b1b282ccd81 ("irqdomain: Added domain bus token DOMAIN_BUS_FSL_MC_MSI") from the staging tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell diff --cc include/linux/irqdomain.h index ed48594e96d2,0934d06c8b00..000000000000 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@@ -74,7 -74,7 +74,8 @@@ enum irq_domain_bus_token DOMAIN_BUS_PCI_MSI, DOMAIN_BUS_PLATFORM_MSI, DOMAIN_BUS_NEXUS, + DOMAIN_BUS_IPI, + DOMAIN_BUS_FSL_MC_MSI, }; /**