linux-kernel - RE: linux-next: manual merge of the acpi 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 for Android: free password hash cracker in your pocket

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

Date:	Sun, 17 Feb 2013 07:31:57 +0000
From:	"Zheng, Lv" <lv.zheng@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Len Brown <lenb@...nel.org>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Daniel Lezcano <daniel.lezcano@...aro.org>,
	"Huang, Ying" <ying.huang@...el.com>,
	"Krogerus, Heikki" <heikki.krogerus@...el.com>,
	"Moore, Robert" <robert.moore@...el.com>
Subject: RE: linux-next: manual merge of the acpi tree with the pm tree

> Hi Len,
> 
> On Mon, 11 Feb 2013 18:34:06 -0500 Len Brown <lenb@...nel.org> wrote:
> >
> > BTW. Rafael's "pm" tree now carries the ACPI patch stream, so it is
> > probably a mis-representation to call my tree the "acpi" tree.
> > My tree is primarily focused on the "idle" part of pm these days.
> 
> OK, I have renamed your tree to "idle".

Thanks for fixing the conflicts.

The new ACPICA release contains a patch renaming the PM_TIMER_FREQUENCY macro.
A further CA release patch cleans up the repo (pm/linux-next) where the release patch set based on.
The conflicts would happen if other repos contained new codes using the old macro definition.

Thanks
-Lv
--
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/