linux-next: manual merge of the pm tree with Linus' tree

linux-next: manual merge of the pm tree with Linus' tree

[Stephen Rothwell]

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

Hi Rafael,

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

  drivers/cpuidle/governors/menu.c

between commit:

  8508cf3ffad4 ("sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD")

from Linus' tree and commit:

  a7fe5190c03f ("cpuidle: menu: Remove get_loadavg() from the performance multiplier")

from the pm 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/cpuidle/governors/menu.c
index 71979605246e,76df4f947f07..000000000000
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@@ -130,11 -130,10 +130,6 @@@ struct menu_device 
  	int		interval_ptr;
  };
  
- static inline int get_loadavg(unsigned long load)
- {
- 	return LOAD_INT(load) * 10 + LOAD_FRAC(load) / 10;
- }
 -
 -#define LOAD_INT(x) ((x) >> FSHIFT)
 -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
--
  static inline int which_bucket(unsigned int duration, unsigned long nr_iowaiters)
  {
  	int bucket = 0;

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

Re: linux-next: manual merge of the pm tree with Linus' tree

[Rafael J. Wysocki]

On Monday, October 29, 2018 3:01:24 AM CET Stephen Rothwell wrote:
> 
> --Sig_/X_/swfdki+BZTJ8afk_lQqW
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
> 
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/cpuidle/governors/menu.c
> 
> between commit:
> 
>   8508cf3ffad4 ("sched: loadavg: consolidate LOAD_INT, LOAD_FRAC, CALC_LOAD=
> ")
> 
> from Linus' tree and commit:
> 
>   a7fe5190c03f ("cpuidle: menu: Remove get_loadavg() from the performance m=
> ultiplier")
> 
> from the pm 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.
> 
> --=20
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/cpuidle/governors/menu.c
> index 71979605246e,76df4f947f07..000000000000
> --- a/drivers/cpuidle/governors/menu.c
> +++ b/drivers/cpuidle/governors/menu.c
> @@@ -130,11 -130,10 +130,6 @@@ struct menu_device=20
>   	int		interval_ptr;
>   };
>  =20
> - static inline int get_loadavg(unsigned long load)
> - {
> - 	return LOAD_INT(load) * 10 + LOAD_FRAC(load) / 10;
> - }
>  -
>  -#define LOAD_INT(x) ((x) >> FSHIFT)
>  -#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
> --
>   static inline int which_bucket(unsigned int duration, unsigned long nr_io=
> waiters)
>   {
>   	int bucket =3D 0;
> 
> --Sig_/X_/swfdki+BZTJ8afk_lQqW
> Content-Type: application/pgp-signature
> Content-Description: OpenPGP digital signature
> 
> 
> --Sig_/X_/swfdki+BZTJ8afk_lQqW--
> 

The fix looks good to me, thanks!

Cheers,
Rafael

Re: linux-next: manual merge of the pm tree with Linus' tree

[Rafael J. Wysocki]

On Monday, November 09, 2015 10:45:12 AM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/of/of_pci.c
>   include/linux/of_pci.h
> 
> between commits:
> 
>   f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only"")
> 
> from Linus' tree and commit:
> 
>   50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks a lot for taking care of this!

Rafael

linux-next: manual merge of the pm tree with Linus' tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/of/of_pci.c
  include/linux/of_pci.h

between commits:

  f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only"")

from Linus' tree and commit:

  50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")

from the pm 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/of/of_pci.c
index ff27177f49ed,b66ee4ebf650..000000000000
--- a/drivers/of/of_pci.c
+++ b/drivers/of/of_pci.c
@@@ -118,51 -117,6 +118,31 @@@ int of_get_pci_domain_nr(struct device_
  }
  EXPORT_SYMBOL_GPL(of_get_pci_domain_nr);
  
 +/**
 + * of_pci_check_probe_only - Setup probe only mode if linux,pci-probe-only
 + *                           is present and valid
 + */
 +void of_pci_check_probe_only(void)
 +{
 +	u32 val;
 +	int ret;
 +
 +	ret = of_property_read_u32(of_chosen, "linux,pci-probe-only", &val);
 +	if (ret) {
 +		if (ret == -ENODATA || ret == -EOVERFLOW)
 +			pr_warn("linux,pci-probe-only without valid value, ignoring\n");
 +		return;
 +	}
 +
 +	if (val)
 +		pci_add_flags(PCI_PROBE_ONLY);
 +	else
 +		pci_clear_flags(PCI_PROBE_ONLY);
 +
 +	pr_info("PCI: PROBE_ONLY %sabled\n", val ? "en" : "dis");
 +}
 +EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
 +
- /**
-  * of_pci_dma_configure - Setup DMA configuration
-  * @dev: ptr to pci_dev struct of the PCI device
-  *
-  * Function to update PCI devices's DMA configuration using the same
-  * info from the OF node of host bridge's parent (if any).
-  */
- void of_pci_dma_configure(struct pci_dev *pci_dev)
- {
- 	struct device *dev = &pci_dev->dev;
- 	struct device *bridge = pci_get_host_bridge_device(pci_dev);
- 
- 	if (!bridge->parent)
- 		return;
- 
- 	of_dma_configure(dev, bridge->parent->of_node);
- 	pci_put_host_bridge_device(bridge);
- }
- EXPORT_SYMBOL_GPL(of_pci_dma_configure);
- 
  #if defined(CONFIG_OF_ADDRESS)
  /**
   * of_pci_get_host_bridge_resources - Parse PCI host bridge resources from DT
diff --cc include/linux/of_pci.h
index 38c0533a3359,ce0e5abeb454..000000000000
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@@ -16,8 -16,6 +16,7 @@@ int of_pci_get_devfn(struct device_nod
  int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin);
  int of_pci_parse_bus_range(struct device_node *node, struct resource *res);
  int of_get_pci_domain_nr(struct device_node *node);
- void of_pci_dma_configure(struct pci_dev *pci_dev);
 +void of_pci_check_probe_only(void);
  #else
  static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
  {
@@@ -52,10 -50,6 +51,8 @@@ of_get_pci_domain_nr(struct device_nod
  {
  	return -1;
  }
 +
- static inline void of_pci_dma_configure(struct pci_dev *pci_dev) { }
- 
 +static inline void of_pci_check_probe_only(void) { }
  #endif
  
  #if defined(CONFIG_OF_ADDRESS)

linux-next: manual merge of the pm tree with Linus' tree

[Stephen Rothwell]

Hi Rafael,

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

  drivers/pci/probe.c

between commit:

  b07461a8e45b ("PCI/AER: Clear error status registers during enumeration and restore")

from Linus' tree and commit:

  29dbe1f0af88 ("PCI: ACPI: Add support for PCI device DMA coherency")

from the pm 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/probe.c
index f53b8e85f137,0dac52633f01..000000000000
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -12,7 -13,7 +13,8 @@@
  #include <linux/module.h>
  #include <linux/cpumask.h>
  #include <linux/pci-aspm.h>
 +#include <linux/aer.h>
+ #include <linux/acpi.h>
  #include <asm-generic/pci-bridge.h>
  #include "pci.h"
  

Re: linux-next: manual merge of the pm tree with Linus' tree

[Rafael J. Wysocki]

On Monday, August 11, 2014 11:43:09 AM Stephen Rothwell wrote:
> 
> --Sig_/=CGwKOD1=eH3=syU/3wkRPC
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
> 
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM:
> Kirkwood: Remove mach-kirkwood") from Linus' tree and commit
> bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
> related to sleep") from the pm tree.
> 
> I fixed it up (I removed the file) and can carry the fix as necessary
> (no action is required).

Thanks a lot!

I've decided to drop the above commit for now.

Rafael

linux-next: manual merge of the pm tree with Linus' tree

[Stephen Rothwell]

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

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-kirkwood/pm.c between commit ba364fc752da ("ARM:
Kirkwood: Remove mach-kirkwood") from Linus' tree and commit
bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
related to sleep") from the pm tree.

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

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

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

linux-next: manual merge of the pm tree with Linus' tree

[Stephen Rothwell]

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

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-imx/pm-imx6.c between commit 80c0ecdce802 ("ARM: imx: add
standby mode support for suspend") from Linus' tree and commit
bb3274b6442d ("PM / sleep: Rename symbols, functions and variables
related to sleep") from the pm tree.

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

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

diff --cc arch/arm/mach-imx/pm-imx6.c
index 5c3af8f993d0,fb4ae1244abd..000000000000
--- a/arch/arm/mach-imx/pm-imx6.c
+++ b/arch/arm/mach-imx/pm-imx6.c
@@@ -342,22 -314,8 +342,22 @@@ static int imx6q_suspend_finish(unsigne
  static int imx6q_pm_enter(suspend_state_t state)
  {
  	switch (state) {
- 	case PM_SUSPEND_STANDBY:
++	case PM_SUSPEND_SHALLOW:
 +		imx6q_set_lpm(STOP_POWER_ON);
 +		imx6q_set_int_mem_clk_lpm(true);
 +		imx_gpc_pre_suspend(false);
 +		if (cpu_is_imx6sl())
 +			imx6sl_set_wait_clk(true);
 +		/* Zzz ... */
 +		cpu_do_idle();
 +		if (cpu_is_imx6sl())
 +			imx6sl_set_wait_clk(false);
 +		imx_gpc_post_resume();
 +		imx6q_set_lpm(WAIT_CLOCKED);
 +		break;
- 	case PM_SUSPEND_MEM:
+ 	case PM_SUSPEND_DEEP:
  		imx6q_set_lpm(STOP_POWER_OFF);
 +		imx6q_set_int_mem_clk_lpm(false);
  		imx6q_enable_wb(true);
  		/*
  		 * For suspend into ocram, asm code already take care of
@@@ -386,14 -343,9 +386,14 @@@
  	return 0;
  }
  
 +static int imx6q_pm_valid(suspend_state_t state)
 +{
- 	return (state == PM_SUSPEND_STANDBY || state == PM_SUSPEND_MEM);
++	return (state == PM_SUSPEND_SHALLOW || state == PM_SUSPEND_DEEP);
 +}
 +
  static const struct platform_suspend_ops imx6q_pm_ops = {
  	.enter = imx6q_pm_enter,
 -	.valid = suspend_valid_only_deep,
 +	.valid = imx6q_pm_valid,
  };
  
  void __init imx6q_pm_set_ccm_base(void __iomem *base)

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

Re: linux-next: manual merge of the pm tree with Linus' tree

[Rafael J. Wysocki]

Hi,

On Friday, May 18, 2012, Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/scan.c between commit 5c7dd710f691 ("ACPI / PCI / PM: Fix
> device PM regression related to D3hot/D3cold") from the  tree and commit
> 6ef564fd2070 ("ACPI / PM: Evaluate _PS3 when entering D3 Cold") from the
> pm tree.
> 
> I fixed it up (by using the version from Linus' tree) and can carry the
> fix as necessary.

Thanks, I'm dropping the conflicting patch from the pm tree.

Rafael

linux-next: manual merge of the pm tree with Linus' tree

[Stephen Rothwell]

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

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c7dd710f691 ("ACPI / PCI / PM: Fix
device PM regression related to D3hot/D3cold") from the  tree and commit
6ef564fd2070 ("ACPI / PM: Evaluate _PS3 when entering D3 Cold") from the
pm tree.

I fixed it up (by using the version from Linus' tree) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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