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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  Documentation/power/pm_qos_interface.rst

between commits:

  151f4e2bdc7a ("docs: power: convert docs to ReST and rename to *.rst")
  562fe2ef1a21 ("PM / QOS: Pass request type to dev_pm_qos_read_value()")

from the pci tree and commit:

  0c4899702720 ("PM / QOS: Pass request type to dev_pm_qos_{add|remove}_notifier()")

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 Documentation/power/pm_qos_interface.rst
index 945fc6d760c9,cfcb1df39799..000000000000
--- a/Documentation/power/pm_qos_interface.rst
+++ b/Documentation/power/pm_qos_interface.rst
@@@ -113,76 -107,72 +113,78 @@@ the aggregated value does not require a
  From kernel mode the use of this interface is the following:
  
  int dev_pm_qos_add_request(device, handle, type, value):
 -Will insert an element into the list for that identified device with the
 -target value.  Upon change to this list the new target is recomputed and any
 -registered notifiers are called only if the target value is now different.
 -Clients of dev_pm_qos need to save the handle for future use in other
 -dev_pm_qos API functions.
 +  Will insert an element into the list for that identified device with the
 +  target value.  Upon change to this list the new target is recomputed and any
 +  registered notifiers are called only if the target value is now different.
 +  Clients of dev_pm_qos need to save the handle for future use in other
 +  dev_pm_qos API functions.
  
  int dev_pm_qos_update_request(handle, new_value):
 -Will update the list element pointed to by the handle with the new target value
 -and recompute the new aggregated target, calling the notification trees if the
 -target is changed.
 +  Will update the list element pointed to by the handle with the new target
 +  value and recompute the new aggregated target, calling the notification
 +  trees if the target is changed.
  
  int dev_pm_qos_remove_request(handle):
 -Will remove the element.  After removal it will update the aggregate target and
 -call the notification trees if the target was changed as a result of removing
 -the request.
 +  Will remove the element.  After removal it will update the aggregate target
 +  and call the notification trees if the target was changed as a result of
 +  removing the request.
  
- s32 dev_pm_qos_read_value(device):
+ s32 dev_pm_qos_read_value(device, type):
 -Returns the aggregated value for a given device's constraints list.
 +  Returns the aggregated value for a given device's constraints list.
  
  enum pm_qos_flags_status dev_pm_qos_flags(device, mask)
 -Check PM QoS flags of the given device against the given mask of flags.
 -The meaning of the return values is as follows:
 -	PM_QOS_FLAGS_ALL: All flags from the mask are set
 -	PM_QOS_FLAGS_SOME: Some flags from the mask are set
 -	PM_QOS_FLAGS_NONE: No flags from the mask are set
 -	PM_QOS_FLAGS_UNDEFINED: The device's PM QoS structure has not been
 -			initialized or the list of requests is empty.
 +  Check PM QoS flags of the given device against the given mask of flags.
 +  The meaning of the return values is as follows:
 +
 +	PM_QOS_FLAGS_ALL:
 +		All flags from the mask are set
 +	PM_QOS_FLAGS_SOME:
 +		Some flags from the mask are set
 +	PM_QOS_FLAGS_NONE:
 +		No flags from the mask are set
 +	PM_QOS_FLAGS_UNDEFINED:
 +		The device's PM QoS structure has not been initialized
 +		or the list of requests is empty.
  
  int dev_pm_qos_add_ancestor_request(dev, handle, type, value)
 -Add a PM QoS request for the first direct ancestor of the given device whose
 -power.ignore_children flag is unset (for DEV_PM_QOS_RESUME_LATENCY requests)
 -or whose power.set_latency_tolerance callback pointer is not NULL (for
 -DEV_PM_QOS_LATENCY_TOLERANCE requests).
 +  Add a PM QoS request for the first direct ancestor of the given device whose
 +  power.ignore_children flag is unset (for DEV_PM_QOS_RESUME_LATENCY requests)
 +  or whose power.set_latency_tolerance callback pointer is not NULL (for
 +  DEV_PM_QOS_LATENCY_TOLERANCE requests).
  
  int dev_pm_qos_expose_latency_limit(device, value)
 -Add a request to the device's PM QoS list of resume latency constraints and
 -create a sysfs attribute pm_qos_resume_latency_us under the device's power
 -directory allowing user space to manipulate that request.
 +  Add a request to the device's PM QoS list of resume latency constraints and
 +  create a sysfs attribute pm_qos_resume_latency_us under the device's power
 +  directory allowing user space to manipulate that request.
  
  void dev_pm_qos_hide_latency_limit(device)
 -Drop the request added by dev_pm_qos_expose_latency_limit() from the device's
 -PM QoS list of resume latency constraints and remove sysfs attribute
 -pm_qos_resume_latency_us from the device's power directory.
 +  Drop the request added by dev_pm_qos_expose_latency_limit() from the device's
 +  PM QoS list of resume latency constraints and remove sysfs attribute
 +  pm_qos_resume_latency_us from the device's power directory.
  
  int dev_pm_qos_expose_flags(device, value)
 -Add a request to the device's PM QoS list of flags and create sysfs attribute
 -pm_qos_no_power_off under the device's power directory allowing user space to
 -change the value of the PM_QOS_FLAG_NO_POWER_OFF flag.
 +  Add a request to the device's PM QoS list of flags and create sysfs attribute
 +  pm_qos_no_power_off under the device's power directory allowing user space to
 +  change the value of the PM_QOS_FLAG_NO_POWER_OFF flag.
  
  void dev_pm_qos_hide_flags(device)
 -Drop the request added by dev_pm_qos_expose_flags() from the device's PM QoS list
 -of flags and remove sysfs attribute pm_qos_no_power_off from the device's power
 -directory.
 +  Drop the request added by dev_pm_qos_expose_flags() from the device's PM QoS list
 +  of flags and remove sysfs attribute pm_qos_no_power_off from the device's power
 +  directory.
  
  Notification mechanisms:
 +
  The per-device PM QoS framework has a per-device notification tree.
  
- int dev_pm_qos_add_notifier(device, notifier):
-   Adds a notification callback function for the device.
+ int dev_pm_qos_add_notifier(device, notifier, type):
 -Adds a notification callback function for the device for a particular request
 -type.
++  Adds a notification callback function for the device for a particular request
++  type.
+ 
 -The callback is called when the aggregated value of the device constraints list
 -is changed.
 +  The callback is called when the aggregated value of the device constraints list
-   is changed (for resume latency device PM QoS only).
++  is changed.
  
- int dev_pm_qos_remove_notifier(device, notifier):
+ int dev_pm_qos_remove_notifier(device, notifier, type):
 -Removes the notification callback function for the device.
 +  Removes the notification callback function for the device.
  
  
  Active state latency tolerance

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