From: Greg KH <greg@kroah.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"J. German Rivera" <German.Rivera@freescale.com>,
Qais Yousef <qais.yousef@imgtec.com>
Subject: Re: linux-next: manual merge of the staging tree with the tip tree
Date: Wed, 2 Mar 2016 09:43:35 -0800 [thread overview]
Message-ID: <20160302174335.GA24233@kroah.com> (raw)
In-Reply-To: <alpine.DEB.2.11.1603020853460.3638@nanos>
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?
Thomas, should I revert the series until you have a chance to ack it?
thanks,
greg k-h
next prev parent reply other threads:[~2016-03-02 17:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 3:35 linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell
2016-03-02 7:54 ` Thomas Gleixner
2016-03-02 17:43 ` Greg KH [this message]
2016-03-02 17:53 ` Jose Rivera
-- strict thread matches above, loose matches on Subject: below --
2015-08-13 4:55 Stephen Rothwell
2015-08-13 15:34 ` Greg KH
2011-10-12 5:34 Stephen Rothwell
2011-10-12 14:53 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160302174335.GA24233@kroah.com \
--to=greg@kroah.com \
--cc=German.Rivera@freescale.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=qais.yousef@imgtec.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.