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

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

[Stephen Rothwell]

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

Hi all,

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

  Documentation/driver-api/index.rst

between commit:

  680e6ffa1510 ("Documentation: add Linux ACPI to Sphinx TOC tree")

from the pm tree and commit:

  09e7d4ed8991 ("docs: Add Generic Counter interface documentation")

from the staging 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/driver-api/index.rst
index aa87075c7846,201247b7c1e8..000000000000
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@@ -56,7 -56,7 +56,8 @@@ available subsections can be seen below
     slimbus
     soundwire/index
     fpga/index
 +   acpi/index
+    generic-counter
  
  .. only::  subproject and html
  

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

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

[Greg KH]

On Tue, Apr 30, 2019 at 05:48:29PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   Documentation/driver-api/index.rst
> 
> between commit:
> 
>   680e6ffa1510 ("Documentation: add Linux ACPI to Sphinx TOC tree")
> 
> from the pm tree and commit:
> 
>   09e7d4ed8991 ("docs: Add Generic Counter interface documentation")
> 
> from the staging 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/driver-api/index.rst
> index aa87075c7846,201247b7c1e8..000000000000
> --- a/Documentation/driver-api/index.rst
> +++ b/Documentation/driver-api/index.rst
> @@@ -56,7 -56,7 +56,8 @@@ available subsections can be seen below
>      slimbus
>      soundwire/index
>      fpga/index
>  +   acpi/index
> +    generic-counter

Looks good to me, thanks!

greg k-h

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

[Greg KH]

On Wed, Oct 12, 2011 at 04:28:05PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq:
> generic DVFS framework with device-specific OPPs") from the pm tree and
> commit 46a971913611 ("Staging: hv: move hyperv code out of staging
> directory") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

The fix for this, and the drivers/Makefile file look correct, thanks.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

On Wed, 12 Oct 2011 16:28:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq:
> generic DVFS framework with device-specific OPPs") from the pm tree and
> commit 46a971913611 ("Staging: hv: move hyperv code out of staging
> directory") from the staging tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Also drivers/Makefile.

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

diff --cc drivers/Makefile
index 97c957b,ef693cf..0000000
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -127,5 -127,5 +127,6 @@@ obj-$(CONFIG_IOMMU_SUPPORT)	+= iommu
  
  # Virtualization drivers
  obj-$(CONFIG_VIRT_DRIVERS)	+= virt/
+ obj-$(CONFIG_HYPERV)		+= hv/
  
 +obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/Kconfig between commit a3c98b8b2ede ("PM: Introduce devfreq:
generic DVFS framework with device-specific OPPs") from the pm tree and
commit 46a971913611 ("Staging: hv: move hyperv code out of staging
directory") from the staging tree.

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

diff --cc drivers/Kconfig
index a1efd75,ce3c35f..0000000
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -130,6 -130,6 +130,8 @@@ source "drivers/iommu/Kconfig
  
  source "drivers/virt/Kconfig"
  
+ source "drivers/hv/Kconfig"
+ 
 +source "drivers/devfreq/Kconfig"
 +
  endmenu

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