Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbcCBT00 (ORCPT ); Wed, 2 Mar 2016 14:26:26 -0500 Received: from mail-am1on0088.outbound.protection.outlook.com ([157.56.112.88]:3344 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750745AbcCBT0Y convert rfc822-to-8bit (ORCPT ); Wed, 2 Mar 2016 14:26:24 -0500 X-Greylist: delayed 3577 seconds by postgrey-1.27 at vger.kernel.org; Wed, 02 Mar 2016 14:26:23 EST From: Jose Rivera To: Greg KH , Thomas Gleixner CC: Stephen Rothwell , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "J. German Rivera" , Qais Yousef Subject: RE: linux-next: manual merge of the staging tree with the tip tree Thread-Topic: linux-next: manual merge of the staging tree with the tip tree Thread-Index: AQHRdDSKomZkCys+TECMstidO8ARg59FySGAgACkjICAAABcAA== Date: Wed, 2 Mar 2016 17:53:30 +0000 Message-ID: References: <20160302143506.5f75d279@canb.auug.org.au> <20160302174335.GA24233@kroah.com> In-Reply-To: <20160302174335.GA24233@kroah.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: kroah.com; dkim=none (message not signed) header.d=none;kroah.com; dmarc=none action=none header.from=nxp.com; x-originating-ip: [192.88.168.49] x-ms-office365-filtering-correlation-id: 97b2dc62-315e-462a-6756-08d342c390b9 x-microsoft-exchange-diagnostics: 1;VI1PR04MB1182;5:0XfjQidnScR6li4DQbeNwi1uIdLlTNuyXfLYeJz8KR+Ifrhj9ueppP5DAv2LAyRV5Vb9absiD1naYnBedoJQzeFCEimMqE3b1igjKPLXAKNJk0oH0ygx6ISZQ9MqRkIdZN87zBOIGOHl06IvJ3Y5yA==;24:t+PK37S++yIoyNkwxBgHbJmdH83Mmtq7dXqK9AD4EYhfjQRB7Bk2mzLT0hvwCd1jZHN8/aDj7d+eYKC+BBhgNGI1HYZkWAwR+7BrBfBobPQ= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB1182; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046);SRVR:VI1PR04MB1182;BCL:0;PCL:0;RULEID:;SRVR:VI1PR04MB1182; x-forefront-prvs: 086943A159 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(6009001)(164054003)(377454003)(13464003)(24454002)(19580395003)(3660700001)(19580405001)(10400500002)(106116001)(3280700002)(5008740100001)(122556002)(189998001)(40100003)(11100500001)(66066001)(3846002)(86362001)(92566002)(5001960100004)(5003600100002)(2950100001)(2900100001)(1096002)(1220700001)(4326007)(102836003)(6116002)(2906002)(87936001)(586003)(76176999)(50986999)(54356999)(5001770100001)(33656002)(74316001)(77096005)(76576001)(5002640100001)(81156010)(5004730100002)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR04MB1182;H:VI1PR04MB1184.eurprd04.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Mar 2016 17:53:30.0841 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1182 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2304 Lines: 74 > -----Original Message----- > From: Greg KH [mailto:greg@kroah.com] > Sent: Wednesday, March 02, 2016 11:44 AM > To: Thomas Gleixner > Cc: Stephen Rothwell ; Ingo Molnar > ; H. Peter Anvin ; Peter Zijlstra > ; linux-next@vger.kernel.org; linux- > kernel@vger.kernel.org; J. German Rivera ; > Qais Yousef > Subject: Re: linux-next: manual merge of the staging tree with the tip tree > > On Wed, Mar 02, 2016 at 08:54:39AM +0100, Thomas Gleixner wrote: > > On Wed, 2 Mar 2016, Stephen Rothwell wrote: > > > 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, > > > > Errm. What's that? Did that DOMAIN_BUS_FSL_MC_MSI thingy get any > > review of the irq[domain] maintainers? > > For some reason I thought it did, but in looking at the patch series, it doesn't > seem like that happened :( > > The patch series started with this message id on lkml: > Message-ID: <1452117809-1870-1-git-send-email- > German.Rivera@freescale.com> > > German, any reason why you didn't cc: the irqdomain people on this series? > This series was reviewed by Jiang Liu and Marc Zyngier . I apologize if I overlooked to CC Thomas as well. Thanks, German > Thomas, should I revert the series until you have a chance to ack it? > > thanks, > > greg k-h