linux-kernel - Re: [GIT PULL] ACPI & Power Management Patches for Linux-3.5-rc1

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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFzvj_0+kunG0fy1xDsTxrO-qBU7rg-6mpnFKoLq7XyROw@mail.gmail.com>
Date:	Tue, 5 Jun 2012 09:43:57 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Len Brown <lenb@...nel.org>, Alan Cox <alan@...rguk.ukuu.org.uk>
Cc:	linux-acpi <linux-acpi@...r.kernel.org>,
	Linux PM list <linux-pm@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
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@...nel.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/