Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1347759 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-03-02 04:40 +0100 |
| Last post | 2016-03-02 20:30 +0100 |
| Articles | 4 — 4 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-03-02 04:40 +0100
Re: linux-next: manual merge of the staging tree with the tip tree Thomas Gleixner <tglx@linutronix.de> - 2016-03-02 09:00 +0100
Re: linux-next: manual merge of the staging tree with the tip tree Greg KH <greg@kroah.com> - 2016-03-02 18:50 +0100
RE: linux-next: manual merge of the staging tree with the tip tree Jose Rivera <german.rivera@nxp.com> - 2016-03-02 20:30 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-03-02 04:40 +0100 |
| Subject | linux-next: manual merge of the staging tree with the tip tree |
| Message-ID | <r85NL-1Xc-3@gated-at.bofh.it> |
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,
};
/**
[toc] | [next] | [standalone]
| From | Thomas Gleixner <tglx@linutronix.de> |
|---|---|
| Date | 2016-03-02 09:00 +0100 |
| Message-ID | <r89Ro-4zm-7@gated-at.bofh.it> |
| In reply to | #1347759 |
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?
Thanks,
tglx
[toc] | [prev] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2016-03-02 18:50 +0100 |
| Message-ID | <r8j4l-2TR-3@gated-at.bofh.it> |
| In reply to | #1347827 |
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
[toc] | [prev] | [next] | [standalone]
| From | Jose Rivera <german.rivera@nxp.com> |
|---|---|
| Date | 2016-03-02 20:30 +0100 |
| Message-ID | <r8kD8-46z-13@gated-at.bofh.it> |
| In reply to | #1348357 |
> -----Original Message-----
> From: Greg KH [mailto:greg@kroah.com]
> Sent: Wednesday, March 02, 2016 11:44 AM
> 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
>
> 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 <jiang.liu@linux.intel.com>
and Marc Zyngier <marc.zyngier@arm.com>. 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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web