On Sunday 11 August 2013 21:09:32 gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> The patch below does not apply to the 3.10-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@xxxxxxxxxxxxxxx>.
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 60f75b8e97daf4a39790a20d962cb861b9220af5 Mon Sep 17 00:00:00 2001
> From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
> Date: Wed, 7 Aug 2013 22:55:00 +0200
> Subject: [PATCH] ACPI: Try harder to resolve _ADR collisions for bridges
The conflict occurs because of:
commit c7d9ca90aa9497f0b6e301ec67c52dd4b57a7852
Author: Jeff Wu <zlinuxkernel@xxxxxxxxx>
Date: Wed May 29 06:31:30 2013 +0000
ACPI: add _STA evaluation at do_acpi_find_child()
Since that patch has been superseded by the new patch, there is a
conflict due to context changes. In order to solve this conflict,
run a merge tool and accept changes from this patch.
Alternative solution: cherry-pick the above commit, apply this
patch and squash it. Rafael, can you take care of this?
Thanks,
Peter
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html