Messages in this thread | | | From | Linus Torvalds <> | Date | Tue, 5 Jun 2012 09:43:57 -0700 | Subject | Re: [GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1 |
| |
On Mon, Jun 4, 2012 at 8:34 AM, Len Brown <lenb@kernel.org> wrote: > Merge branch 'upstream' into bugfix-video
So I *think* this merge is a mismerge, but I want to verify with Alan.
I think the drivers/gpu/drm/gma500/psb_drv.c should be taken from current mainline: you commented out the call to "acpi_video_register()", and while it is true that both branches did comment that line out, mainline actually has further changes *afterwards* that put it back in again. Notably commit d839ede47a56 ("gma500: opregion and ACPI").
So I *think* that the resolution to that merge should have been to just take everything from mainline.
Alan? Can you check out the tree at
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git release
or are you still busy with the queen?
Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |