Re: linux-next: manual merge of the pci tree with the asm-generic tree

2018-04-04 Thread Bjorn Helgaas 
On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell 
wrote:

> Hi all,

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

> arch/cris/arch-v32/drivers/pci/bios.c

> between commits:

> c690eddc2f3b ("CRIS: Drop support for the CRIS port")
> fd8773f9f544 ("arch: remove frv port")
> 739d875dd698 ("mn10300: Remove the architecture")

> from the asm-generic tree and commit:

> 31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")

> from the pci tree.

FWIW, I dropped the cris, frv, and mn10300 parts from my patch
(31cbca85df15).

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2018-04-04 Thread Bjorn Helgaas 
On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell 
wrote:

> Hi all,

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

> arch/cris/arch-v32/drivers/pci/bios.c

> between commits:

> c690eddc2f3b ("CRIS: Drop support for the CRIS port")
> fd8773f9f544 ("arch: remove frv port")
> 739d875dd698 ("mn10300: Remove the architecture")

> from the asm-generic tree and commit:

> 31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")

> from the pci tree.

FWIW, I dropped the cris, frv, and mn10300 parts from my patch
(31cbca85df15).

linux-next: manual merge of the pci tree with the asm-generic tree

2018-04-02 Thread Stephen Rothwell 
Hi all,

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

  arch/cris/arch-v32/drivers/pci/bios.c

between commits:

  c690eddc2f3b ("CRIS: Drop support for the CRIS port")
  fd8773f9f544 ("arch: remove frv port")
  739d875dd698 ("mn10300: Remove the architecture")

from the asm-generic tree and commit:

  31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")

from the pci tree.

I fixed it up (I just removed the files) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell


pgpZAJjUn6vel.pgp
Description: OpenPGP digital signature

linux-next: manual merge of the pci tree with the asm-generic tree

2018-04-02 Thread Stephen Rothwell 
Hi all,

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

  arch/cris/arch-v32/drivers/pci/bios.c

between commits:

  c690eddc2f3b ("CRIS: Drop support for the CRIS port")
  fd8773f9f544 ("arch: remove frv port")
  739d875dd698 ("mn10300: Remove the architecture")

from the asm-generic tree and commit:

  31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")

from the pci tree.

I fixed it up (I just removed the files) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell


pgpZAJjUn6vel.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-26 Thread Stephen Rothwell 
Hi Liviu,

On Fri, 26 Sep 2014 10:13:57 +0100 Liviu Dudau  wrote:
>
> I agree with Thierry's solution.
> 
> I don't know how these cases are handled. Should I send Bjorn a patch for his 
> tree?

They need to be fixed in one or other of the trees, so yes.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-26 Thread Liviu Dudau 
On Fri, Sep 26, 2014 at 08:00:23AM +0100, Thierry Reding wrote:
> On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote:
> > Hi Bjorn,
> > 
> > Today's linux-next merge of the pci tree got a conflict in
> > include/asm-generic/io.h between commit 4005bfe0aa45
> > ("asm-generic/io.h: Implement generic {read,write}s*()") from the
> > asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
> > ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.
> > 
> > I fixed it up (the only difference is that the latter castes the result
> > to void __iomem * - see below) and can carry the fix as necessary (no
> > action is required).
> > 
> > -- 
> > Cheers,
> > Stephen Rothwells...@canb.auug.org.au
> > 
> > diff --cc include/asm-generic/io.h
> > index 3e976be3bdd4,2e2161b0c795..
> > --- a/include/asm-generic/io.h
> > +++ b/include/asm-generic/io.h
> > @@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
> >   
> >   #ifdef CONFIG_HAS_IOPORT_MAP
> >   #ifndef CONFIG_GENERIC_IOMAP
> >  +#ifndef ioport_map
> >  +#define ioport_map ioport_map
> >   static inline void __iomem *ioport_map(unsigned long port, unsigned int 
> > nr)
> >   {
> > -   return PCI_IOBASE + (port & IO_SPACE_LIMIT);
> > +   return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));
> 
> I don't think that cast is necessary. All instances of PCI_IOBASE are
> already defined to be void __iomem *.
> 
> Or at least they were until a few days ago. Commit f3dfddf7bd85 (ARM:
> Define PCI_IOBASE as the base of virtual PCI IO space) introduces one
> variant for ARM which isn't actually void __iomem *. I think what we
> should do is standardize the type of PCI_IOBASE.
> 
> So how about we remove commit 3aad9c969c09 (asm-generic/io.h: Fix
> ioport_map() for !CONFIG_GENERIC_IOMAP) and move the cast to void
> __iomem * to Liviu's definition of PCI_IOBASE for ARM?
> 
> Thierry

Hi Stephen,

I agree with Thierry's solution.

I don't know how these cases are handled. Should I send Bjorn a patch for his 
tree?

Best regards,
Liviu


-- 

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---
¯\_(ツ)_/¯

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-26 Thread Thierry Reding 
On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
> 
> Today's linux-next merge of the pci tree got a conflict in
> include/asm-generic/io.h between commit 4005bfe0aa45
> ("asm-generic/io.h: Implement generic {read,write}s*()") from the
> asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
> ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.
> 
> I fixed it up (the only difference is that the latter castes the result
> to void __iomem * - see below) and can carry the fix as necessary (no
> action is required).
> 
> -- 
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
> 
> diff --cc include/asm-generic/io.h
> index 3e976be3bdd4,2e2161b0c795..
> --- a/include/asm-generic/io.h
> +++ b/include/asm-generic/io.h
> @@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
>   
>   #ifdef CONFIG_HAS_IOPORT_MAP
>   #ifndef CONFIG_GENERIC_IOMAP
>  +#ifndef ioport_map
>  +#define ioport_map ioport_map
>   static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
>   {
> - return PCI_IOBASE + (port & IO_SPACE_LIMIT);
> + return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));

I don't think that cast is necessary. All instances of PCI_IOBASE are
already defined to be void __iomem *.

Or at least they were until a few days ago. Commit f3dfddf7bd85 (ARM:
Define PCI_IOBASE as the base of virtual PCI IO space) introduces one
variant for ARM which isn't actually void __iomem *. I think what we
should do is standardize the type of PCI_IOBASE.

So how about we remove commit 3aad9c969c09 (asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP) and move the cast to void
__iomem * to Liviu's definition of PCI_IOBASE for ARM?

Thierry


pgpTeZMzmGPkY.pgp
Description: PGP signature

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-26 Thread Thierry Reding 
On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote:
 Hi Bjorn,
 
 Today's linux-next merge of the pci tree got a conflict in
 include/asm-generic/io.h between commit 4005bfe0aa45
 (asm-generic/io.h: Implement generic {read,write}s*()) from the
 asm-generic tree and commit 3aad9c969c09 (asm-generic/io.h: Fix
 ioport_map() for !CONFIG_GENERIC_IOMAP) from the pci tree.
 
 I fixed it up (the only difference is that the latter castes the result
 to void __iomem * - see below) and can carry the fix as necessary (no
 action is required).
 
 -- 
 Cheers,
 Stephen Rothwells...@canb.auug.org.au
 
 diff --cc include/asm-generic/io.h
 index 3e976be3bdd4,2e2161b0c795..
 --- a/include/asm-generic/io.h
 +++ b/include/asm-generic/io.h
 @@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
   
   #ifdef CONFIG_HAS_IOPORT_MAP
   #ifndef CONFIG_GENERIC_IOMAP
  +#ifndef ioport_map
  +#define ioport_map ioport_map
   static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
   {
 - return PCI_IOBASE + (port  IO_SPACE_LIMIT);
 + return (void __iomem *)(PCI_IOBASE + (port  IO_SPACE_LIMIT));

I don't think that cast is necessary. All instances of PCI_IOBASE are
already defined to be void __iomem *.

Or at least they were until a few days ago. Commit f3dfddf7bd85 (ARM:
Define PCI_IOBASE as the base of virtual PCI IO space) introduces one
variant for ARM which isn't actually void __iomem *. I think what we
should do is standardize the type of PCI_IOBASE.

So how about we remove commit 3aad9c969c09 (asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP) and move the cast to void
__iomem * to Liviu's definition of PCI_IOBASE for ARM?

Thierry


pgpTeZMzmGPkY.pgp
Description: PGP signature

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-26 Thread Liviu Dudau 
On Fri, Sep 26, 2014 at 08:00:23AM +0100, Thierry Reding wrote:
 On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote:
  Hi Bjorn,
  
  Today's linux-next merge of the pci tree got a conflict in
  include/asm-generic/io.h between commit 4005bfe0aa45
  (asm-generic/io.h: Implement generic {read,write}s*()) from the
  asm-generic tree and commit 3aad9c969c09 (asm-generic/io.h: Fix
  ioport_map() for !CONFIG_GENERIC_IOMAP) from the pci tree.
  
  I fixed it up (the only difference is that the latter castes the result
  to void __iomem * - see below) and can carry the fix as necessary (no
  action is required).
  
  -- 
  Cheers,
  Stephen Rothwells...@canb.auug.org.au
  
  diff --cc include/asm-generic/io.h
  index 3e976be3bdd4,2e2161b0c795..
  --- a/include/asm-generic/io.h
  +++ b/include/asm-generic/io.h
  @@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome

#ifdef CONFIG_HAS_IOPORT_MAP
#ifndef CONFIG_GENERIC_IOMAP
   +#ifndef ioport_map
   +#define ioport_map ioport_map
static inline void __iomem *ioport_map(unsigned long port, unsigned int 
  nr)
{
  -   return PCI_IOBASE + (port  IO_SPACE_LIMIT);
  +   return (void __iomem *)(PCI_IOBASE + (port  IO_SPACE_LIMIT));
 
 I don't think that cast is necessary. All instances of PCI_IOBASE are
 already defined to be void __iomem *.
 
 Or at least they were until a few days ago. Commit f3dfddf7bd85 (ARM:
 Define PCI_IOBASE as the base of virtual PCI IO space) introduces one
 variant for ARM which isn't actually void __iomem *. I think what we
 should do is standardize the type of PCI_IOBASE.
 
 So how about we remove commit 3aad9c969c09 (asm-generic/io.h: Fix
 ioport_map() for !CONFIG_GENERIC_IOMAP) and move the cast to void
 __iomem * to Liviu's definition of PCI_IOBASE for ARM?
 
 Thierry

Hi Stephen,

I agree with Thierry's solution.

I don't know how these cases are handled. Should I send Bjorn a patch for his 
tree?

Best regards,
Liviu


-- 

| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---
¯\_(ツ)_/¯

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-26 Thread Stephen Rothwell 
Hi Liviu,

On Fri, 26 Sep 2014 10:13:57 +0100 Liviu Dudau liviu.du...@arm.com wrote:

 I agree with Thierry's solution.
 
 I don't know how these cases are handled. Should I send Bjorn a patch for his 
 tree?

They need to be fixed in one or other of the trees, so yes.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-25 Thread Stephen Rothwell 
Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
include/asm-generic/io.h between commit 4005bfe0aa45
("asm-generic/io.h: Implement generic {read,write}s*()") from the
asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.

I fixed it up (the only difference is that the latter castes the result
to void __iomem * - see below) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc include/asm-generic/io.h
index 3e976be3bdd4,2e2161b0c795..
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
  
  #ifdef CONFIG_HAS_IOPORT_MAP
  #ifndef CONFIG_GENERIC_IOMAP
 +#ifndef ioport_map
 +#define ioport_map ioport_map
  static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
  {
-   return PCI_IOBASE + (port & IO_SPACE_LIMIT);
+   return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));
  }
 +#endif
  
 +#ifndef ioport_unmap
 +#define ioport_unmap ioport_unmap
  static inline void ioport_unmap(void __iomem *p)
  {
  }


signature.asc
Description: PGP signature

linux-next: manual merge of the pci tree with the asm-generic tree

2014-09-25 Thread Stephen Rothwell 
Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
include/asm-generic/io.h between commit 4005bfe0aa45
(asm-generic/io.h: Implement generic {read,write}s*()) from the
asm-generic tree and commit 3aad9c969c09 (asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP) from the pci tree.

I fixed it up (the only difference is that the latter castes the result
to void __iomem * - see below) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc include/asm-generic/io.h
index 3e976be3bdd4,2e2161b0c795..
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
  
  #ifdef CONFIG_HAS_IOPORT_MAP
  #ifndef CONFIG_GENERIC_IOMAP
 +#ifndef ioport_map
 +#define ioport_map ioport_map
  static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
  {
-   return PCI_IOBASE + (port  IO_SPACE_LIMIT);
+   return (void __iomem *)(PCI_IOBASE + (port  IO_SPACE_LIMIT));
  }
 +#endif
  
 +#ifndef ioport_unmap
 +#define ioport_unmap ioport_unmap
  static inline void ioport_unmap(void __iomem *p)
  {
  }


signature.asc
Description: PGP signature