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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 19 Jun 2015 15:04:39 +1000
From:	Michael Ellerman <mpe@...erman.id.au>
To:	Darren Hart <dvhart@...radead.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hans de Goede <hdegoede@...hat.com>,
	Corentin Chary <corentin.chary@...il.com>
Subject: linux-next: manual merge of the drivers-x86 tree with the pm tree

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



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/