am c9c84992: am 266eb4a4: Merge "Stop using the non-uapi <linux/err.h> header file."

* commit 'c9c84992fb9ccbf32580c93967356383f58d9687':
  Stop using the non-uapi <linux/err.h> header file.