From: Michael Ellerman <mpe@ellerman.id.au>
To: Darren Hart <dvhart@infradead.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hans de Goede <hdegoede@redhat.com>,
Corentin Chary <corentin.chary@gmail.com>
Subject: linux-next: manual merge of the drivers-x86 tree with the pm tree
Date: Fri, 19 Jun 2015 15:04:39 +1000 [thread overview]
Message-ID: <1434690279.23771.10.camel@ellerman.id.au> (raw)
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
next reply other threads:[~2015-06-19 5:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 5:04 Michael Ellerman [this message]
2015-06-19 19:38 ` linux-next: manual merge of the drivers-x86 tree with the pm tree Darren Hart
-- strict thread matches above, loose matches on Subject: below --
2022-12-06 0:24 Stephen Rothwell
2022-09-19 4:20 Stephen Rothwell
2022-09-19 7:05 ` Hans de Goede
2022-03-03 2:32 Stephen Rothwell
2014-01-22 5:42 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434690279.23771.10.camel@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=corentin.chary@gmail.com \
--cc=dvhart@infradead.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox