[Bug 1089355] Kernel patch 7969-1 (reissue? of kernels 4.4.126) does not apply without conflict resolution