attached two independent patches following v4.2 uapi updates