Displaying 1 result from an estimated 1 matches for "0cd6ac52b333".
2013 Feb 15
0
RE: linux-next: build failure after merge of the xen-two tree
...thus requiring no rebasing.
> However, Linus likes to see such interactions, so it can be left up
> to when the latter of the two tress is merged by Linus.
Per my understanding, currently in git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git, it has included
1). 636458de36f1, 0cd6ac52b333, b8bd759acd05: from pm tree (Rafael), drop acpi_bus_add, update argument of acpi_bus_scan
2). 259f201cb7ea, 181232c249f0: from xen tree (Jinsong), use acpi_bus_add
3). 36bd3c64bfe2 Stephen fix confliction of 1) and 2)
Currently these are only some compiling warning left, so the only thing ne...