I was using linux-pm.git/linux-next base which I downloaded a week ago. Maybe the conflict was caused by the fast-path ACPICA table fix merged after my downloading. Let me check again. Thanks and best regards -Lv > From: Rafael J. Wysocki [mailto:rjw@xxxxxxxxxxxxx] > Sent: Tuesday, October 20, 2015 5:04 AM > > On Monday, October 19, 2015 10:25:32 AM Lv Zheng wrote: > > ACPICA commit 0dd68e16274cd38224aa4781eddc57dc2cbaa108 > > > > The quit/exit commands shouldn't invoke acpi_terminate_debugger() and > > acpi_terminate() right in the user command loop, because when the debugger > > exits, the kernel ACPI subsystem shouldn't be terminated (acpi_terminate()) > > and the debugger should only be terminated by its users > > (acpi_terminate_debugger()) rather than being terminated itself. Leaving such > > invocations causes kernel panic when the debugger is shipped in the Linux > > kernel. > > > > This patch fixes this issue. Lv Zheng. > > > > Link: https://github.com/acpica/acpica/commit/0dd68e16 > > Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> > > Signed-off-by: Bob Moore <robert.moore@xxxxxxxxx> > > This patch does not apply for me on top of the current mainline. > > What tree is it applicable to? > > Thanks, > Rafael ��.n��������+%������w��{.n�����{�����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
