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

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