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

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