[ltp] Re: Gen 2 (Haswell) X1 Carbon suspend to RAM hang

[Nikos Alexandris]

..

Bj=C3=B8rn:

>> Maybe it's conflicting with some other unrelated change?

Nikos:

> So, I should simply try to force
> applying the patch? And even then, the "old" method of `rmmdod
> thinkpad_acpi` responds always with "rmmod: ERROR: Module
> thinkpad_acpi is in use".

> I have the source and the headers of linux-3.14.19 beforehand.
> Though, I am running on
>=20
> <https://github.com/fearedbliss/bliss-overlay/blob/master/sys-kernel/bl=
iss-kernel/bliss-kernel-3.14.19.ebuild>.

So, here is some attempt:

--%<---
tpx1c2g linux-3.14.19 # patch -p1 < /tmp/foo
patching file drivers/platform/x86/thinkpad_acpi.c
Reversed (or previously applied) patch detected!  Assume -R? [n] n
Apply anyway? [n] y
Hunk #1 succeeded at 3537 with fuzz 1 (offset 100 lines).
Hunk #2 FAILED at 3556.
1 out of 2 hunks FAILED -- saving rejects to file=20
drivers/platform/x86/thinkpad_acpi.c.rej
patch unexpectedly ends in middle of line
--->%--

and

--%<---
cat drivers/platform/x86/thinkpad_acpi.c.rej
--- drivers/platform/x86/thinkpad_acpi.c
+++ drivers/platform/x86/thinkpad_acpi.c
@@ -3556,6 +3656,8 @@
                         *ignore_acpi_ev =3D true;
                 }
                 return true;
+       } else {
+               return=20
adaptive_keyboard_hotkey_notify_hotkey(scancode);
         }
         return false;
  }
--->%--

Nikos