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

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

[Stephen Rothwell]

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

Hi all,

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

  arch/x86/pci/xen.c

between commit:

  b0623566c2e9 ("x86/xen: Fix xen_msi_init() missing prototype warning")

from the pci tree and commit:

  2905c50b7d3e ("x86/xen: Make xen_msi_init() static and rename it to xen_hvm_msi_init()")

from the tip tree.

I fixed it up (I just used the latter since it incorporated the change
from the former) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Bjorn Helgaas]

On Thu, Oct 01, 2020 at 04:38:27PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/x86/pci/xen.c
> 
> between commit:
> 
>   b0623566c2e9 ("x86/xen: Fix xen_msi_init() missing prototype warning")

I dropped this from my tree, thanks for the heads-up.

> from the pci tree and commit:
> 
>   2905c50b7d3e ("x86/xen: Make xen_msi_init() static and rename it to xen_hvm_msi_init()")
> 
> from the tip tree.
> 
> I fixed it up (I just used the latter since it incorporated the change
> from the former) 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

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

[Stephen Rothwell]

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

Hi all,

On Mon, 9 Oct 2023 13:47:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   include/linux/pci_ids.h
> 
> between commit:
> 
>   7e6f3b6d2c35 ("PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device")
> 
> from the pci tree and commit:
> 
>   24775700eaa9 ("x86/amd_nb: Add AMD Family MI300 PCI IDs")
> 
> from the tip tree.
> 
> I fixed it up (see below) 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
> 
> diff --cc include/linux/pci_ids.h
> index 3a8e24e9a93f,91b457de262e..000000000000
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@@ -579,7 -579,7 +579,8 @@@
>   #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
>   #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
>   #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3
> + #define PCI_DEVICE_ID_AMD_MI300_DF_F3	0x152b
>  +#define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a
>   #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
>   #define PCI_DEVICE_ID_AMD_LANCE		0x2000
>   #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

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

  include/linux/pci_ids.h

between commit:

  7e6f3b6d2c35 ("PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device")

from the pci tree and commit:

  24775700eaa9 ("x86/amd_nb: Add AMD Family MI300 PCI IDs")

from the tip tree.

I fixed it up (see below) 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

diff --cc include/linux/pci_ids.h
index 3a8e24e9a93f,91b457de262e..000000000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -579,7 -579,7 +579,8 @@@
  #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
  #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
  #define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3
+ #define PCI_DEVICE_ID_AMD_MI300_DF_F3	0x152b
 +#define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a
  #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
  #define PCI_DEVICE_ID_AMD_LANCE		0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got conflicts in:

  drivers/pci/controller/Kconfig
  drivers/pci/controller/dwc/Kconfig
  drivers/pci/controller/mobiveil/Kconfig

between commit:

  19cb0749bae1 ("PCI: Allow building CONFIG_OF drivers with COMPILE_TEST")

from the pci tree and commit:

  a474d3fbe287 ("PCI/MSI: Get rid of PCI_MSI_IRQ_DOMAIN")

from the tip tree.

I fixed it up (see below) 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

diff --cc drivers/pci/controller/Kconfig
index a62e9fbb69ca,1569d9a3ada0..000000000000
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@@ -18,8 -18,8 +18,8 @@@ config PCI_MVEB
  config PCI_AARDVARK
  	tristate "Aardvark PCIe controller"
  	depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCI_BRIDGE_EMUL
  	help
  	 Add support for Aardvark 64bit PCIe Host Controller. This
@@@ -215,8 -214,8 +215,8 @@@ config PCIE_ROCKCHI
  config PCIE_ROCKCHIP_HOST
  	tristate "Rockchip PCIe host controller"
  	depends on ARCH_ROCKCHIP || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select MFD_SYSCON
  	select PCIE_ROCKCHIP
  	help
@@@ -239,8 -238,8 +239,8 @@@ config PCIE_ROCKCHIP_E
  config PCIE_MEDIATEK
  	tristate "MediaTek PCIe controller"
  	depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	help
  	  Say Y here if you want to enable PCIe controller support on
  	  MediaTek SoCs.
@@@ -277,8 -276,8 +277,8 @@@ config PCIE_BRCMST
  	tristate "Broadcom Brcmstb PCIe host controller"
  	depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCMBCA || \
  		   BMIPS_GENERIC || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	default ARCH_BRCMSTB || BMIPS_GENERIC
  	help
  	  Say Y here to enable PCIe host controller support for
@@@ -303,10 -302,7 +303,8 @@@ config PCI_LOONGSO
  
  config PCIE_MICROCHIP_HOST
  	bool "Microchip AXI PCIe host bridge support"
 -	depends on PCI_MSI && OF
 +	depends on OF || COMPILE_TEST
 +	depends on PCI_MSI
- 	select PCI_MSI_IRQ_DOMAIN
- 	select GENERIC_MSI_IRQ_DOMAIN
  	select PCI_HOST_COMMON
  	help
  	  Say Y here if you want kernel to support the Microchip AXI PCIe
@@@ -327,8 -323,8 +325,8 @@@ config PCIE_APPLE_MSI_DOORBELL_ADD
  config PCIE_APPLE
  	tristate "Apple PCIe controller"
  	depends on ARCH_APPLE || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCI_HOST_COMMON
  	help
  	  Say Y here if you want to enable PCIe controller support on Apple
diff --cc drivers/pci/controller/dwc/Kconfig
index aa0a2fcd41f1,f3c462130627..000000000000
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@@ -20,9 -20,8 +20,9 @@@ config PCI_DRA7X
  config PCI_DRA7XX_HOST
  	tristate "TI DRA7xx PCIe controller Host Mode"
  	depends on SOC_DRA7XX || COMPILE_TEST
 -	depends on OF && HAS_IOMEM && TI_PIPE3
 +	depends on OF || COMPILE_TEST
 +	depends on HAS_IOMEM && TI_PIPE3
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	select PCI_DRA7XX
  	default y if SOC_DRA7XX
@@@ -136,9 -134,8 +136,9 @@@ config PCI_KEYSTONE_E
  
  config PCI_LAYERSCAPE
  	bool "Freescale Layerscape PCIe controller - Host mode"
 -	depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST)
 +	depends on ARM || ARCH_LAYERSCAPE || COMPILE_TEST
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	select MFD_SYSCON
  	help
@@@ -162,10 -158,9 +162,10 @@@ config PCI_LAYERSCAPE_E
  	  controller works in RC mode.
  
  config PCI_HISI
 -	depends on OF && (ARM64 || COMPILE_TEST)
  	bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
 +	depends on ARM64 || COMPILE_TEST
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	select PCI_HOST_COMMON
  	help
@@@ -174,9 -169,8 +174,9 @@@
  
  config PCIE_QCOM
  	bool "Qualcomm PCIe controller"
 -	depends on OF && (ARCH_QCOM || COMPILE_TEST)
 +	depends on ARCH_QCOM || COMPILE_TEST
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	select CRC8
  	help
@@@ -233,18 -226,17 +233,18 @@@ config PCIE_ROCKCHIP_DW_HOS
  	bool "Rockchip DesignWare PCIe controller"
  	select PCIE_DW
  	select PCIE_DW_HOST
 -	depends on PCI_MSI
  	depends on ARCH_ROCKCHIP || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
++	depends on PCI_MSI
  	help
  	  Enables support for the DesignWare PCIe controller in the
  	  Rockchip SoC except RK3399.
  
  config PCIE_INTEL_GW
  	bool "Intel Gateway PCIe host controller support"
 -	depends on OF && (X86 || COMPILE_TEST)
 +	depends on X86 || COMPILE_TEST
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	help
  	  Say 'Y' here to enable PCIe Host controller support on Intel
@@@ -281,10 -273,9 +281,10 @@@ config PCIE_KEEMBAY_E
  	  DesignWare core functions.
  
  config PCIE_KIRIN
 -	depends on OF && (ARM64 || COMPILE_TEST)
  	tristate "HiSilicon Kirin series SoCs PCIe controllers"
 +	depends on ARM64 || COMPILE_TEST
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	help
  	  Say Y here if you want PCIe controller support
@@@ -354,9 -345,8 +354,9 @@@ config PCIE_VISCONTI_HOS
  config PCIE_UNIPHIER
  	bool "Socionext UniPhier PCIe host controllers"
  	depends on ARCH_UNIPHIER || COMPILE_TEST
 -	depends on OF && HAS_IOMEM
 +	depends on OF || COMPILE_TEST
 +	depends on HAS_IOMEM
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	help
  	  Say Y here if you want PCIe host controller support on UniPhier SoCs.
@@@ -375,9 -364,8 +375,9 @@@ config PCIE_UNIPHIER_E
  
  config PCIE_AL
  	bool "Amazon Annapurna Labs PCIe controller"
 -	depends on OF && (ARM64 || COMPILE_TEST)
 +	depends on ARM64 || COMPILE_TEST
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_DW_HOST
  	select PCI_ECAM
  	help
diff --cc drivers/pci/controller/mobiveil/Kconfig
index 24ea35927185,1d7a07ba9ccd..000000000000
--- a/drivers/pci/controller/mobiveil/Kconfig
+++ b/drivers/pci/controller/mobiveil/Kconfig
@@@ -14,8 -14,8 +14,8 @@@ config PCIE_MOBIVEIL_HOS
  config PCIE_MOBIVEIL_PLAT
  	bool "Mobiveil AXI PCIe controller"
  	depends on ARCH_ZYNQMP || COMPILE_TEST
 -	depends on OF
 +	depends on OF || COMPILE_TEST
- 	depends on PCI_MSI_IRQ_DOMAIN
+ 	depends on PCI_MSI
  	select PCIE_MOBIVEIL_HOST
  	help
  	  Say Y here if you want to enable support for the Mobiveil AXI PCIe

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Bjorn Helgaas]

On Mon, Nov 30, 2020 at 11:21:20AM +0100, Borislav Petkov wrote:
> On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the tip tree got a conflict in:
> > 
> >   arch/x86/pci/i386.c
> > 
> > between commit:
> > 
> >   ace091d17272 ("x86/PCI: Fix kernel-doc markup")
> > 
> > from the pci tree and commit:
> > 
> >   638920a66a17 ("x86/PCI: Make a kernel-doc comment a normal one")
> > 
> > from the tip tree.
> 
> Bjorn, I fixed up the comment too, while picking up, see below. But I
> don't care all that much which one to take so I leave it up to you to
> decide. :-)

I dropped ace091d17272 ("x86/PCI: Fix kernel-doc markup") from my
tree so we keep your comment improvements.  Thanks!

> commit 638920a66a17c8e1f4415cbab0d49dc4a344c2a7
> Author: Alex Shi <alex.shi@linux.alibaba.com>
> Date:   Fri Nov 13 16:58:14 2020 +0800
> 
>     x86/PCI: Make a kernel-doc comment a normal one
>     
>     The comment is using kernel-doc markup but that comment isn't a
>     kernel-doc comment so make it a normal one to avoid:
>     
>       arch/x86/pci/i386.c:373: warning: Function parameter or member \
>               'pcibios_assign_resources' not described in 'fs_initcall'
>     
>      [ bp: Massage and fixup comment while at it. ]
>     
>     Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
>     Signed-off-by: Borislav Petkov <bp@suse.de>
>     Link: https://lkml.kernel.org/r/1605257895-5536-5-git-send-email-alex.shi@linux.alibaba.com
> 
> diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
> index fa855bbaebaf..f2f4a5d50b27 100644
> --- a/arch/x86/pci/i386.c
> +++ b/arch/x86/pci/i386.c
> @@ -366,9 +366,9 @@ static int __init pcibios_assign_resources(void)
>  	return 0;
>  }
>  
> -/**
> - * called in fs_initcall (one below subsys_initcall),
> - * give a chance for motherboard reserve resources
> +/*
> + * This is an fs_initcall (one below subsys_initcall) in order to reserve
> + * resources properly.
>   */
>  fs_initcall(pcibios_assign_resources);
>  
> 
> 
> -- 
> Regards/Gruss,
>     Boris.
> 
> SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

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

[Borislav Petkov]

On Mon, Nov 30, 2020 at 03:03:36PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/x86/pci/i386.c
> 
> between commit:
> 
>   ace091d17272 ("x86/PCI: Fix kernel-doc markup")
> 
> from the pci tree and commit:
> 
>   638920a66a17 ("x86/PCI: Make a kernel-doc comment a normal one")
> 
> from the tip tree.

Bjorn, I fixed up the comment too, while picking up, see below. But I
don't care all that much which one to take so I leave it up to you to
decide. :-)

Thx.

commit 638920a66a17c8e1f4415cbab0d49dc4a344c2a7
Author: Alex Shi <alex.shi@linux.alibaba.com>
Date:   Fri Nov 13 16:58:14 2020 +0800

    x86/PCI: Make a kernel-doc comment a normal one
    
    The comment is using kernel-doc markup but that comment isn't a
    kernel-doc comment so make it a normal one to avoid:
    
      arch/x86/pci/i386.c:373: warning: Function parameter or member \
              'pcibios_assign_resources' not described in 'fs_initcall'
    
     [ bp: Massage and fixup comment while at it. ]
    
    Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/1605257895-5536-5-git-send-email-alex.shi@linux.alibaba.com

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index fa855bbaebaf..f2f4a5d50b27 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -366,9 +366,9 @@ static int __init pcibios_assign_resources(void)
 	return 0;
 }
 
-/**
- * called in fs_initcall (one below subsys_initcall),
- * give a chance for motherboard reserve resources
+/*
+ * This is an fs_initcall (one below subsys_initcall) in order to reserve
+ * resources properly.
  */
 fs_initcall(pcibios_assign_resources);
 


-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

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

[Stephen Rothwell]

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

Hi all,

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

  arch/x86/pci/i386.c

between commit:

  ace091d17272 ("x86/PCI: Fix kernel-doc markup")

from the pci tree and commit:

  638920a66a17 ("x86/PCI: Make a kernel-doc comment a normal one")

from the tip tree.

I fixed it up (I just used the latter version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

On Fri, 25 Sep 2020 15:35:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/x86/kernel/apic/msi.c
> 
> between commit:
> 
>   2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configuring IRTE")
> 
> from the pci tree and commit:
> 
>   7ca435cf857d ("x86/irq: Cleanup the arch_*_msi_irqs() leftovers")
> 
> from the tip tree.
> 
> I fixed it up (the latter removed the code updated by the former, so I
> did that) 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.

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

On Fri, 25 Sep 2020 15:21:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/pci/controller/vmd.c
> 
> between commit:
> 
>   42443f036042 ("PCI: vmd: Create IRQ Domain configuration helper")
> 
> from the pci tree and commit:
> 
>   585dfe8abc44 ("PCI: vmd: Dont abuse vector irqomain as parent")
> 
> from the tip tree.
> 
> I fixed it up (see below) 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.
> 
> diff --cc drivers/pci/controller/vmd.c
> index 3c4418cbde1c,aa1b12bac9a1..000000000000
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@@ -304,50 -298,6 +304,50 @@@ static struct msi_domain_info vmd_msi_d
>   	.chip		= &vmd_msi_controller,
>   };
>   
>  +static void vmd_enable_msi_remapping(struct vmd_dev *vmd, bool enable)
>  +{
>  +	u16 reg;
>  +
>  +	pci_read_config_word(vmd->dev, PCI_REG_VMCONFIG, &reg);
>  +	reg = enable ? (reg & ~0x2) : (reg | 0x2);
>  +	pci_write_config_word(vmd->dev, PCI_REG_VMCONFIG, reg);
>  +}
>  +
>  +static int vmd_create_irq_domain(struct vmd_dev *vmd)
>  +{
>  +	struct fwnode_handle *fn;
>  +
>  +	fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain);
>  +	if (!fn)
>  +		return -ENODEV;
>  +
>  +	vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info,
> - 						    x86_vector_domain);
> ++						    NULL);
>  +	if (!vmd->irq_domain) {
>  +		irq_domain_free_fwnode(fn);
>  +		return -ENODEV;
>  +	}
>  +
>  +	return 0;
>  +}
>  +
>  +static void vmd_remove_irq_domain(struct vmd_dev *vmd)
>  +{
>  +	/*
>  +	 * Some production BIOS won't enable remapping between soft reboots.
>  +	 * Ensure remapping is restored before unloading the driver
>  +	 */
>  +	if (!vmd->msix_count)
>  +		vmd_enable_msi_remapping(vmd, true);
>  +
>  +	if (vmd->irq_domain) {
>  +		struct fwnode_handle *fn = vmd->irq_domain->fwnode;
>  +
>  +		irq_domain_remove(vmd->irq_domain);
>  +		irq_domain_free_fwnode(fn);
>  +	}
>  +}
>  +
>   static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus,
>   				  unsigned int devfn, int reg, int len)
>   {
> @@@ -717,12 -568,24 +717,18 @@@ static int vmd_enable_domain(struct vmd
>   
>   	sd->node = pcibus_to_node(vmd->dev->bus);
>   
>  -	fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain);
>  -	if (!fn)
>  -		return -ENODEV;
>  -
>  -	vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info,
>  -						    NULL);
>  -
>  -	if (!vmd->irq_domain) {
>  -		irq_domain_free_fwnode(fn);
>  -		return -ENODEV;
>  +	if (vmd->msix_count) {
>  +		ret = vmd_create_irq_domain(vmd);
>  +		if (ret)
>  +			return ret;
>   	}
>   
> + 	/*
> + 	 * Override the irq domain bus token so the domain can be distinguished
> + 	 * from a regular PCI/MSI domain.
> + 	 */
> + 	irq_domain_update_bus_token(vmd->irq_domain, DOMAIN_BUS_VMD_MSI);
> + 
>   	pci_add_resource(&resources, &vmd->resources[0]);
>   	pci_add_resource_offset(&resources, &vmd->resources[1], offset[0]);
>   	pci_add_resource_offset(&resources, &vmd->resources[2], offset[1]);

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

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

  arch/x86/kernel/apic/msi.c

between commit:

  2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configuring IRTE")

from the pci tree and commit:

  7ca435cf857d ("x86/irq: Cleanup the arch_*_msi_irqs() leftovers")

from the tip tree.

I fixed it up (the latter removed the code updated by the former, so I
did that) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

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

Hi all,

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

  drivers/pci/controller/vmd.c

between commit:

  42443f036042 ("PCI: vmd: Create IRQ Domain configuration helper")

from the pci tree and commit:

  585dfe8abc44 ("PCI: vmd: Dont abuse vector irqomain as parent")

from the tip tree.

I fixed it up (see below) 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

diff --cc drivers/pci/controller/vmd.c
index 3c4418cbde1c,aa1b12bac9a1..000000000000
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@@ -304,50 -298,6 +304,50 @@@ static struct msi_domain_info vmd_msi_d
  	.chip		= &vmd_msi_controller,
  };
  
 +static void vmd_enable_msi_remapping(struct vmd_dev *vmd, bool enable)
 +{
 +	u16 reg;
 +
 +	pci_read_config_word(vmd->dev, PCI_REG_VMCONFIG, &reg);
 +	reg = enable ? (reg & ~0x2) : (reg | 0x2);
 +	pci_write_config_word(vmd->dev, PCI_REG_VMCONFIG, reg);
 +}
 +
 +static int vmd_create_irq_domain(struct vmd_dev *vmd)
 +{
 +	struct fwnode_handle *fn;
 +
 +	fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain);
 +	if (!fn)
 +		return -ENODEV;
 +
 +	vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info,
- 						    x86_vector_domain);
++						    NULL);
 +	if (!vmd->irq_domain) {
 +		irq_domain_free_fwnode(fn);
 +		return -ENODEV;
 +	}
 +
 +	return 0;
 +}
 +
 +static void vmd_remove_irq_domain(struct vmd_dev *vmd)
 +{
 +	/*
 +	 * Some production BIOS won't enable remapping between soft reboots.
 +	 * Ensure remapping is restored before unloading the driver
 +	 */
 +	if (!vmd->msix_count)
 +		vmd_enable_msi_remapping(vmd, true);
 +
 +	if (vmd->irq_domain) {
 +		struct fwnode_handle *fn = vmd->irq_domain->fwnode;
 +
 +		irq_domain_remove(vmd->irq_domain);
 +		irq_domain_free_fwnode(fn);
 +	}
 +}
 +
  static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus,
  				  unsigned int devfn, int reg, int len)
  {
@@@ -717,12 -568,24 +717,18 @@@ static int vmd_enable_domain(struct vmd
  
  	sd->node = pcibus_to_node(vmd->dev->bus);
  
 -	fn = irq_domain_alloc_named_id_fwnode("VMD-MSI", vmd->sysdata.domain);
 -	if (!fn)
 -		return -ENODEV;
 -
 -	vmd->irq_domain = pci_msi_create_irq_domain(fn, &vmd_msi_domain_info,
 -						    NULL);
 -
 -	if (!vmd->irq_domain) {
 -		irq_domain_free_fwnode(fn);
 -		return -ENODEV;
 +	if (vmd->msix_count) {
 +		ret = vmd_create_irq_domain(vmd);
 +		if (ret)
 +			return ret;
  	}
  
+ 	/*
+ 	 * Override the irq domain bus token so the domain can be distinguished
+ 	 * from a regular PCI/MSI domain.
+ 	 */
+ 	irq_domain_update_bus_token(vmd->irq_domain, DOMAIN_BUS_VMD_MSI);
+ 
  	pci_add_resource(&resources, &vmd->resources[0]);
  	pci_add_resource_offset(&resources, &vmd->resources[1], offset[0]);
  	pci_add_resource_offset(&resources, &vmd->resources[2], offset[1]);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Christoph Hellwig]

On Wed, Jun 28, 2017 at 01:15:34PM +1000, Stephen Rothwell wrote:
> I fixed it up (see below) 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.

The merge looks fine to me.

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

[Stephen Rothwell]

Hi all,

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

  kernel/irq/affinity.c

between commit:

  6f9a22bc5775 ("PCI/MSI: Ignore affinity if pre/post vector count is more than min_vecs")

from the pci tree and commit:

  9a0ef98e186d ("genirq/affinity: Assign vectors to all present CPUs")

from the tip tree.

I fixed it up (see below) 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

diff --cc kernel/irq/affinity.c
index 9b71406d2eec,d2747f9c5707..000000000000
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@@ -64,15 -108,8 +108,15 @@@ irq_create_affinity_masks(int nvecs, co
  	int last_affv = affv + affd->pre_vectors;
  	nodemask_t nodemsk = NODE_MASK_NONE;
  	struct cpumask *masks;
- 	cpumask_var_t nmsk;
+ 	cpumask_var_t nmsk, *node_to_present_cpumask;
  
 +	/*
 +	 * If there aren't any vectors left after applying the pre/post
 +	 * vectors don't bother with assigning affinity.
 +	 */
 +	if (!affv)
 +		return NULL;
 +
  	if (!zalloc_cpumask_var(&nmsk, GFP_KERNEL))
  		return NULL;
  
@@@ -155,15 -199,10 +207,13 @@@ int irq_calc_affinity_vectors(int minve
  {
  	int resv = affd->pre_vectors + affd->post_vectors;
  	int vecs = maxvec - resv;
- 	int cpus;
+ 	int ret;
  
 +	if (resv > minvec)
 +		return 0;
 +
- 	/* Stabilize the cpumasks */
  	get_online_cpus();
- 	cpus = cpumask_weight(cpu_online_mask);
+ 	ret = min_t(int, cpumask_weight(cpu_present_mask), vecs) + resv;
  	put_online_cpus();
- 
- 	return min(cpus, vecs) + resv;
+ 	return ret;
  }

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

[Bjorn Helgaas]

On Fri, Dec 09, 2016 at 01:38:13PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/pci/msi.c
> 
> between commit:
> 
>   67f1e4473857 ("PCI/MSI: Document new parameter for msi_capability_init()")
> 
> from the pci tree and commit:
> 
>   61e1c5905290 ("PCI/MSI: Propagate IRQ affinity description through the MSI code")
> 
> from the tip tree.
> 
> I fixed it up (see below) 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.

Thanks, I didn't realize Thomas had already merged this.  I dropped
the slightly different one from my tree.

> diff --cc drivers/pci/msi.c
> index da95f4e689f2,dd27f73a45fc..000000000000
> --- a/drivers/pci/msi.c
> +++ b/drivers/pci/msi.c
> @@@ -753,14 -754,14 +754,14 @@@ static void msix_program_entries(struc
>    * @dev: pointer to the pci_dev data structure of MSI-X device function
>    * @entries: pointer to an array of struct msix_entry entries
>    * @nvec: number of @entries
> -  * @affinity: flag to indicate CPU IRQ affinity mask should be set
> +  * @affd: Optional pointer to enable automatic affinity assignement
>    *
>    * Setup the MSI-X capability structure of device function with a
>  - * single MSI-X irq. A return of zero indicates the successful setup of
>  - * requested MSI-X entries with allocated irqs or non-zero for otherwise.
>  + * single MSI-X IRQ. A return of zero indicates the successful setup of
>  + * requested MSI-X entries with allocated IRQs or non-zero for otherwise.
>    **/
>   static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
> - 				int nvec, bool affinity)
> + 				int nvec, const struct irq_affinity *affd)
>   {
>   	int ret;
>   	u16 control;

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

[Stephen Rothwell]

Hi all,

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

  drivers/pci/msi.c

between commit:

  67f1e4473857 ("PCI/MSI: Document new parameter for msi_capability_init()")

from the pci tree and commit:

  61e1c5905290 ("PCI/MSI: Propagate IRQ affinity description through the MSI code")

from the tip tree.

I fixed it up (see below) 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

diff --cc drivers/pci/msi.c
index da95f4e689f2,dd27f73a45fc..000000000000
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@@ -753,14 -754,14 +754,14 @@@ static void msix_program_entries(struc
   * @dev: pointer to the pci_dev data structure of MSI-X device function
   * @entries: pointer to an array of struct msix_entry entries
   * @nvec: number of @entries
-  * @affinity: flag to indicate CPU IRQ affinity mask should be set
+  * @affd: Optional pointer to enable automatic affinity assignement
   *
   * Setup the MSI-X capability structure of device function with a
 - * single MSI-X irq. A return of zero indicates the successful setup of
 - * requested MSI-X entries with allocated irqs or non-zero for otherwise.
 + * single MSI-X IRQ. A return of zero indicates the successful setup of
 + * requested MSI-X entries with allocated IRQs or non-zero for otherwise.
   **/
  static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,
- 				int nvec, bool affinity)
+ 				int nvec, const struct irq_affinity *affd)
  {
  	int ret;
  	u16 control;

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

[Thomas Gleixner]

On Mon, 24 Nov 2014, Stephen Rothwell wrote:
> Today's linux-next merge of the tip tree got a conflict in
> drivers/pci/host/pcie-rcar.c between commit 3c70637f7569 ("PCI: rcar:
> Make rcar_pci static") from the pci tree and commit 7c35c8cc32f3 ("PCI:
> rcar: Save MSI controller in pci_sys_data") from the tip tree.

Bjorn redid his pci/msi branch. The older version of this branch has
been in the tip/tree to base a larger set of MSI irq related changes
on it. I rebased on Bjorns latest so that conflict should be gone
tomorrow.

Thanks,

	tglx

	

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/pci/host/pcie-rcar.c between commit 3c70637f7569 ("PCI: rcar:
Make rcar_pci static") from the pci tree and commit 7c35c8cc32f3 ("PCI:
rcar: Save MSI controller in pci_sys_data") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/pci/host/pcie-rcar.c
index 0df9b2941221,c1177cd55ce3..000000000000
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@@ -380,16 -380,7 +380,7 @@@ static int rcar_pcie_setup(int nr, stru
  	return 1;
  }
  
- static void rcar_pcie_add_bus(struct pci_bus *bus)
- {
- 	if (IS_ENABLED(CONFIG_PCI_MSI)) {
- 		struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
- 
- 		bus->msi = &pcie->msi.chip;
- 	}
- }
- 
 -struct hw_pci rcar_pci = {
 +static struct hw_pci rcar_pci = {
  	.setup          = rcar_pcie_setup,
  	.map_irq        = of_irq_parse_and_map_pci,
  	.ops            = &rcar_pcie_ops,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Mark Brown]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in arch/x86/include/asm/topology.h between commit 25453e9e521382 ("x86/PCI: Remove mp_bus_to_node[], set_mp_bus_to_node(), get_mp_bus_to_node()") from the pci tree and commit 36fc5500bb1907bea7e ("sched: Remove unused mc_capable() and smt_capable()") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).


diff --cc arch/x86/include/asm/topology.h
index c840571afa4e,9bcc724cafdd..000000000000
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@@ -131,13 -131,19 +131,7 @@@ static inline void arch_fix_phys_packag
  }
  
  struct pci_bus;
 +int x86_pci_root_bus_node(int bus);
  void x86_pci_root_bus_resources(int bus, struct list_head *resources);
  
- #ifdef CONFIG_SMP
- #define mc_capable()  ((boot_cpu_data.x86_max_cores > 1) && \
-                       (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids))
- #define smt_capable()                 (smp_num_siblings > 1)
 -#ifdef CONFIG_NUMA
 -extern int get_mp_bus_to_node(int busnum);
 -extern void set_mp_bus_to_node(int busnum, int node);
 -#else
 -static inline int get_mp_bus_to_node(int busnum)
 -{
 -      return 0;
 -}
 -static inline void set_mp_bus_to_node(int busnum, int node)
 -{
 -}
--#endif
--
  #endif /* _ASM_X86_TOPOLOGY_H */

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

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

[Liviu Dudau]

On Mon, Mar 03, 2014 at 06:03:35AM +0000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> drivers/pci/Makefile between commit 39656f29f665 ("PCI: Cleanup per-arch
> list of object files") from the pci tree and commit c5f9ee3d665a ("x86,
> platforms: Remove SGI Visual Workstation") from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen, that looks fine to me.

Best regards,
Liviu

> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/pci/Makefile
> index e2501ac6fe84,9d5ee4dcee7d..000000000000
> --- a/drivers/pci/Makefile
> +++ b/drivers/pci/Makefile
> @@@ -33,15 -33,20 +33,14 @@@ obj-$(CONFIG_PCI_IOV) += iov.
>   #
>   # Some architectures use the generic PCI setup functions
>   #
>  -obj-$(CONFIG_X86) += setup-bus.o
>  -obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_PARISC) += setup-bus.o
>  -obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_PPC) += setup-bus.o
>  -obj-$(CONFIG_FRV) += setup-bus.o
>  -obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_MN10300) += setup-bus.o
>  -obj-$(CONFIG_MICROBLAZE) += setup-bus.o
>  -obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_M68K) += setup-bus.o setup-irq.o
>  +obj-$(CONFIG_ALPHA) += setup-irq.o
>  +obj-$(CONFIG_ARM) += setup-irq.o
>  +obj-$(CONFIG_UNICORE32) += setup-irq.o
>  +obj-$(CONFIG_SUPERH) += setup-irq.o
>  +obj-$(CONFIG_MIPS) += setup-irq.o
> - obj-$(CONFIG_X86_VISWS) += setup-irq.o
>  +obj-$(CONFIG_TILE) += setup-irq.o
>  +obj-$(CONFIG_SPARC_LEON) += setup-irq.o
>  +obj-$(CONFIG_M68K) += setup-irq.o
>   
>   #
>   # ACPI Related PCI FW Functions



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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got conflicts in
arch/x86/pci/numaq_32.c and arch/x86/pci/visws.c between commit
8d7d818676d3 ("x86/PCI: Use pcibios_scan_root() instead of
pci_scan_bus_with_sysdata()") from the pci tree and commits c5f9ee3d665a
("x86, platforms: Remove SGI Visual Workstation") and b5660ba76b41 ("x86,
platforms: Remove NUMAQ") from the tip tree.

I just removed the files and can carry the fix as necessary (no action
is required).

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

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/pci/Makefile between commit 39656f29f665 ("PCI: Cleanup per-arch
list of object files") from the pci tree and commit c5f9ee3d665a ("x86,
platforms: Remove SGI Visual Workstation") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/pci/Makefile
index e2501ac6fe84,9d5ee4dcee7d..000000000000
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -33,15 -33,20 +33,14 @@@ obj-$(CONFIG_PCI_IOV) += iov.
  #
  # Some architectures use the generic PCI setup functions
  #
 -obj-$(CONFIG_X86) += setup-bus.o
 -obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_PARISC) += setup-bus.o
 -obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_PPC) += setup-bus.o
 -obj-$(CONFIG_FRV) += setup-bus.o
 -obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_MN10300) += setup-bus.o
 -obj-$(CONFIG_MICROBLAZE) += setup-bus.o
 -obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o
 -obj-$(CONFIG_M68K) += setup-bus.o setup-irq.o
 +obj-$(CONFIG_ALPHA) += setup-irq.o
 +obj-$(CONFIG_ARM) += setup-irq.o
 +obj-$(CONFIG_UNICORE32) += setup-irq.o
 +obj-$(CONFIG_SUPERH) += setup-irq.o
 +obj-$(CONFIG_MIPS) += setup-irq.o
- obj-$(CONFIG_X86_VISWS) += setup-irq.o
 +obj-$(CONFIG_TILE) += setup-irq.o
 +obj-$(CONFIG_SPARC_LEON) += setup-irq.o
 +obj-$(CONFIG_M68K) += setup-irq.o
  
  #
  # ACPI Related PCI FW Functions

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in
include/linux/acpi.h between commit c8678473609b ("ACPI: Tidy acpi_run_osc
() declarations") from the pci tree and commit 4b3db708b114 ("ACPI, x86:
Extended error log driver for x86 platform") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc include/linux/acpi.h
index 35e68358ad06,c30bac8503bc..000000000000
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -294,33 -294,32 +294,34 @@@ void __init acpi_nvs_nosave_s3(void)
  #endif /* CONFIG_PM_SLEEP */
  
  struct acpi_osc_context {
 -	char *uuid_str; /* uuid string */
 +	char *uuid_str;			/* UUID string */
  	int rev;
 -	struct acpi_buffer cap; /* arg2/arg3 */
 -	struct acpi_buffer ret; /* free by caller if success */
 +	struct acpi_buffer cap;		/* list of DWORD capabilities */
 +	struct acpi_buffer ret;		/* free by caller if success */
  };
  
 -#define OSC_QUERY_TYPE			0
 -#define OSC_SUPPORT_TYPE 		1
 -#define OSC_CONTROL_TYPE		2
 -
 -/* _OSC DW0 Definition */
 -#define OSC_QUERY_ENABLE		1
 -#define OSC_REQUEST_ERROR		2
 -#define OSC_INVALID_UUID_ERROR		4
 -#define OSC_INVALID_REVISION_ERROR	8
 -#define OSC_CAPABILITIES_MASK_ERROR	16
 -
+ acpi_status acpi_str_to_uuid(char *str, u8 *uuid);
  acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
  
 -/* platform-wide _OSC bits */
 -#define OSC_SB_PAD_SUPPORT		1
 -#define OSC_SB_PPC_OST_SUPPORT		2
 -#define OSC_SB_PR3_SUPPORT		4
 -#define OSC_SB_HOTPLUG_OST_SUPPORT	8
 -#define OSC_SB_APEI_SUPPORT		16
 +/* Indexes into _OSC Capabilities Buffer (DWORDs 2 & 3 are device-specific) */
 +#define OSC_QUERY_DWORD				0	/* DWORD 1 */
 +#define OSC_SUPPORT_DWORD			1	/* DWORD 2 */
 +#define OSC_CONTROL_DWORD			2	/* DWORD 3 */
 +
 +/* _OSC Capabilities DWORD 1: Query/Control and Error Returns (generic) */
 +#define OSC_QUERY_ENABLE			0x00000001  /* input */
 +#define OSC_REQUEST_ERROR			0x00000002  /* return */
 +#define OSC_INVALID_UUID_ERROR			0x00000004  /* return */
 +#define OSC_INVALID_REVISION_ERROR		0x00000008  /* return */
 +#define OSC_CAPABILITIES_MASK_ERROR		0x00000010  /* return */
 +
 +/* Platform-Wide Capabilities _OSC: Capabilities DWORD 2: Support Field */
 +#define OSC_SB_PAD_SUPPORT			0x00000001
 +#define OSC_SB_PPC_OST_SUPPORT			0x00000002
 +#define OSC_SB_PR3_SUPPORT			0x00000004
 +#define OSC_SB_HOTPLUG_OST_SUPPORT		0x00000008
 +#define OSC_SB_APEI_SUPPORT			0x00000010
 +#define OSC_SB_CPC_SUPPORT			0x00000020
  
  extern bool osc_sb_apei_support_acked;
  

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