linux-next: manual merge of the staging tree with the tip tree

linux-next: manual merge of the staging tree with the tip tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/ozwpan/ozproto.c

between commit:

  5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")

from the tip tree and commit:

  a73e99cb67e7 ("staging: ozwpan: Remove from tree")

from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: manual merge of the staging tree with the tip tree

[Greg KH]

On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/ozwpan/ozproto.c
> 
> between commit:
> 
>   5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
> 
> from the tip tree and commit:
> 
>   a73e99cb67e7 ("staging: ozwpan: Remove from tree")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).

Sounds good to me, thanks.

greg k-h

RE: linux-next: manual merge of the staging tree with the tip tree

[Jose Rivera]

> -----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

Re: linux-next: manual merge of the staging tree with the tip tree

[Greg KH]

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

Re: linux-next: manual merge of the staging tree with the tip tree

[Thomas Gleixner]

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

linux-next: manual merge of the staging tree with the tip tree

[Stephen Rothwell]

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,
  };
  
  /**

Re: linux-next: manual merge of the staging tree with the tip tree

[Greg KH]

On Wed, Oct 12, 2011 at 04:34:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/hv/Makefile between commit 6f4151c89b7d ("x86: Hyper-V:
> Integrate the clocksource with Hyper-V detection code") from the tip tree
> and commit 46a971913611 ("Staging: hv: move hyperv code out of staging
> directory") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks correct, thanks.

greg k-h

linux-next: manual merge of the staging tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/hv/Makefile between commit 6f4151c89b7d ("x86: Hyper-V:
Integrate the clocksource with Hyper-V detection code") from the tip tree
and commit 46a971913611 ("Staging: hv: move hyperv code out of staging
directory") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/hv/Makefile
index 14e3c6a,e071c12..0000000
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@@ -1,14 -1,7 +1,6 @@@
- obj-$(CONFIG_HYPERV)		+= hv_vmbus.o
 -obj-$(CONFIG_HYPERV)		+= hv_timesource.o
  obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
- obj-$(CONFIG_HYPERV_BLOCK)	+= hv_blkvsc.o
  obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
- obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
  obj-$(CONFIG_HYPERV_MOUSE)	+= hv_mouse.o
  
- hv_vmbus-y := vmbus_drv.o \
- 		 hv.o connection.o channel.o \
- 		 channel_mgmt.o ring_buffer.o
- hv_storvsc-y := storvsc_drv.o storvsc.o
- hv_blkvsc-y := blkvsc_drv.o  storvsc.o
+ hv_storvsc-y := storvsc_drv.o
  hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
- hv_utils-y := hv_util.o hv_kvp.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]