Guest User

Untitled

a guest
Sep 17th, 2018
98
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. [hieuc@archlinux linux-4.19-rc4]$ patch -p1 < ../patch0.patch
  2. patching file drivers/pinctrl/intel/pinctrl-intel.c
  3. Reversed (or previously applied) patch detected! Assume -R? [n] n
  4. Apply anyway? [n] y
  5. Hunk #1 FAILED at 875.
  6. Hunk #2 FAILED at 1013.
  7. Hunk #3 succeeded at 1117 (offset -4 lines).
  8. 2 out of 3 hunks FAILED -- saving rejects to file drivers/pinctrl/intel/pinctrl-intel.c.rej
  9. patching file drivers/pinctrl/intel/pinctrl-cannonlake.c
  10. Reversed (or previously applied) patch detected! Assume -R? [n] n
  11. Apply anyway? [n] y
  12. Hunk #1 FAILED at 444.
  13. 1 out of 1 hunk FAILED -- saving rejects to file drivers/pinctrl/intel/pinctrl-cannonlake.c.rej
  14. [hieuc@archlinux linux-4.19-rc4]$ cat drivers/pinctrl/intel/pinctrl-cannonlake.c.rej | grep irqd
  15. [hieuc@archlinux linux-4.19-rc4]$ cat drivers/pinctrl/intel/pinctrl-cannonlake.c.rej | grep if 0
  16. grep: 0: No such file or directory
  17. [hieuc@archlinux linux-4.19-rc4]$ cat drivers/pinctrl/intel/pinctrl-cannonlake.c.rej | grep if
  18. [hieuc@archlinux linux-4.19-rc4]$ cat drivers/pinctrl/intel/pinctrl-cannonlake.c.rej | grep s
  19. --- drivers/pinctrl/intel/pinctrl-cannonlake.c
  20. +++ drivers/pinctrl/intel/pinctrl-cannonlake.c
  21. @@ -444,12 +444,8 @@ static const struct intel_function cnlh_functions[] = {
  22. static const struct intel_community cnlh_communities[] = {
  23. CNL_COMMUNITY(0, 0, 50, cnlh_community0_gpps),
  24. CNL_COMMUNITY(1, 51, 154, cnlh_community1_gpps),
  25. - * ACPI MMIO resources are returned in reverse order for
  26. - * communities 3 and 4.
  27. - CNL_COMMUNITY(3, 155, 248, cnlh_community3_gpps),
  28. - CNL_COMMUNITY(2, 249, 298, cnlh_community4_gpps),
  29. + CNL_COMMUNITY(2, 155, 248, cnlh_community3_gpps),
  30. + CNL_COMMUNITY(3, 249, 298, cnlh_community4_gpps),
  31. static const struct intel_pinctrl_soc_data cnlh_soc_data = {
  32. [hieuc@archlinux linux-4.19-rc4]$ cat drivers/pinctrl/intel/pinctrl-cannonlake.c.rej | grep if
  33. [hieuc@archlinux linux-4.19-rc4]$ cat drivers/pinctrl/intel/pinctrl-cannonlake.c.rej | grep irq
  34. [hieuc@archlinux linux-4.19-rc4]$ make clean
  35. [hieuc@archlinux linux-4.19-rc4]$ make mrproper
  36. [hieuc@archlinux linux-4.19-rc4]$ patch -p1 -i < ../patch0.patch
  37. patch: option requires an argument -- 'i'
  38. patch: Try 'patch --help' for more information.
  39. [hieuc@archlinux linux-4.19-rc4]$ patch -p1 < ../patch0.patch
  40. patching file drivers/pinctrl/intel/pinctrl-intel.c
  41. Reversed (or previously applied) patch detected! Assume -R? [n] n
  42. Apply anyway? [n] y
  43. Hunk #1 FAILED at 875.
  44. Hunk #2 FAILED at 1013.
  45. Hunk #3 FAILED at 1121.
  46. 3 out of 3 hunks FAILED -- saving rejects to file drivers/pinctrl/intel/pinctrl-intel.c.rej
  47. patching file drivers/pinctrl/intel/pinctrl-cannonlake.c
  48. Reversed (or previously applied) patch detected! Assume -R? [n] n
  49. Apply anyway? [n] y
  50. Hunk #1 FAILED at 444.
  51. 1 out of 1 hunk FAILED -- saving rejects to file drivers/pinctrl/intel/pinctrl-cannonlake.c.rej
RAW Paste Data