linux-next: manual merge of the drivers-x86 tree with the pm tree

linux-next: manual merge of the drivers-x86 tree with the pm tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/acpi/acpi_video.c

between commit:

  574160b8548d ("ACPI: video: Add Toshiba Satellite/Portege Z830 quirk")

from the pm tree and commit:

  c5b94f5b7819 ("ACPI: video: Change disable_backlight_sysfs_if quirks to acpi_backlight=native")

from the drivers-x86 tree.

I fixed it up (the latter change seems to incoporate 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 drivers-x86 tree with the pm tree

[Hans de Goede]

Hi Stephen,

On 9/19/22 05:20, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the drivers-x86 tree got a conflict in:
> 
>   drivers/acpi/acpi_video.c
> 
> between commit:
> 
>   574160b8548d ("ACPI: video: Add Toshiba Satellite/Portege Z830 quirk")
> 
> from the pm tree and commit:
> 
>   c5b94f5b7819 ("ACPI: video: Change disable_backlight_sysfs_if quirks to acpi_backlight=native")
> 
> from the drivers-x86 tree.
> 
> I fixed it up (the latter change seems to incoporate the former)

Correct, the c5b94f5b7819 commit supersedes the 574160b8548d one.

Thanks you.

Regards,

Hans



> 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.
> 

linux-next: manual merge of the drivers-x86 tree with the pm tree

[Stephen Rothwell]

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

Hi all,

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

  drivers/acpi/battery.c

between commit:

  98b0cf207b61 ("ACPI: battery: Call power_supply_changed() when adding hooks")

from the pm tree and commit:

  878a82c23469 ("ACPI: battery: Pass battery hook pointer to hook callbacks")

from the drivers-x86 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/acpi/battery.c
index 883c75757400,9482b0b6eadc..000000000000
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@@ -696,8 -696,7 +696,8 @@@ static void __battery_hook_unregister(s
  	if (lock)
  		mutex_lock(&hook_mutex);
  	list_for_each_entry(battery, &acpi_battery_list, list) {
- 		if (!hook->remove_battery(battery->bat))
 -		hook->remove_battery(battery->bat, hook);
++		if (!hook->remove_battery(battery->bat, hook))
 +			power_supply_changed(battery->bat);
  	}
  	list_del(&hook->list);
  	if (lock)

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

linux-next: manual merge of the drivers-x86 tree with the pm tree

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  895519c19fae ("MAINTAINERS: Add additional file to uncore frequency control")

from the pm tree and commit:

  ce2645c458b5 ("platform/x86/intel/uncore-freq: Move to uncore-frequency folder")

from the drivers-x86 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 MAINTAINERS
index cc2b69c7bb58,a419a6938786..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9957,8 -9918,7 +9972,8 @@@ INTEL UNCORE FREQUENCY CONTRO
  M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
  L:	platform-driver-x86@vger.kernel.org
  S:	Maintained
 +F:	Documentation/admin-guide/pm/intel_uncore_frequency_scaling.rst
- F:	drivers/platform/x86/intel/uncore-frequency.c
+ F:	drivers/platform/x86/intel/uncore-frequency/
  
  INTEL VENDOR SPECIFIC EXTENDED CAPABILITIES DRIVER
  M:	David E. Box <david.e.box@linux.intel.com>

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

linux-next: manual merge of the drivers-x86 tree with the pm tree

[Michael Ellerman]

Hi Darren,

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

  drivers/platform/x86/apple-gmux.c
  drivers/platform/x86/asus-wmi.c
  drivers/platform/x86/samsung-laptop.c

between commits:

  143958e12fc1 "apple-gmux: Port to new backlight interface selection API"
  1ff99803702b "asus-wmi: Port to new backlight interface selection API"
  705669ed8d41 "samsung-laptop: Port to new backlight interface selection API"

from the pm tree and commits:

  85eaa5fb829a "apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
  5f770658747e "asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
  9330dcdd918a "samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister"

from the drivers-x86 tree.

This was caused by the patches:

  "apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
  "asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
  "samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister"

appearing in both trees as different commits.

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

cheers

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

[Darren Hart]

On Fri, Jun 19, 2015 at 03:04:39PM +1000, Michael Ellerman wrote:
> Hi Darren,
> 
> Today's linux-next merge of the drivers-x86 tree got conflicts in:
> 
>   drivers/platform/x86/apple-gmux.c
>   drivers/platform/x86/asus-wmi.c
>   drivers/platform/x86/samsung-laptop.c
> 
> between commits:
> 
>   143958e12fc1 "apple-gmux: Port to new backlight interface selection API"
>   1ff99803702b "asus-wmi: Port to new backlight interface selection API"
>   705669ed8d41 "samsung-laptop: Port to new backlight interface selection API"
> 
> from the pm tree and commits:
> 
>   85eaa5fb829a "apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
>   5f770658747e "asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
>   9330dcdd918a "samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
> 
> from the drivers-x86 tree.
> 
> This was caused by the patches:
> 
>   "apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
>   "asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
>   "samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister"
> 
> appearing in both trees as different commits.
> 
> I fixed it up and can carry the fix as necessary (no action is required).

OK, thanks.

Rafael, I accepted these three previously from Hans as preparation for the
larger set you recently accepted. Probably nothing to be done as we'll be
sending the pull's to Linus shortly and this will be behind us.

If you really wanted to, you could pick up the three preparatory patches from my
tree and I could drop them... but I try not to rebase my next branch if I can
avoid it.

-- 
Darren Hart
Intel Open Source Technology Center

linux-next: manual merge of the drivers-x86 tree with the pm tree

[Stephen Rothwell]

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

Hi Matthew,

Today's linux-next merge of the drivers-x86 tree got a conflict in
drivers/platform/x86/mxm-wmi.c between commit 8b48463f8942 ("ACPI: Clean
up inclusions of ACPI header files") from the pm tree and commit
475879d65123 ("drivers: platform: Include appropriate header file in
mxm-wmi.c") from the drivers-x86 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/platform/x86/mxm-wmi.c
index 3c59c0a3ee0f,7503d2b9b073..000000000000
--- a/drivers/platform/x86/mxm-wmi.c
+++ b/drivers/platform/x86/mxm-wmi.c
@@@ -20,7 -20,9 +20,8 @@@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/init.h>
+ #include <linux/mxm-wmi.h>
 -#include <acpi/acpi_bus.h>
 -#include <acpi/acpi_drivers.h>
 +#include <linux/acpi.h>
  
  MODULE_AUTHOR("Dave Airlie");
  MODULE_DESCRIPTION("MXM WMI Driver");

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