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

From: Michael Ellerman <[email-masked]>
Date: Fri, 19 Jun 2015 15:04:39 +1000

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