]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 Dec 2018 11:11:54 +0000 (22:11 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 17 Dec 2018 11:11:54 +0000 (22:11 +1100)
commit9f6ab51168e1da5ff1b3ba6b72cee12bb82bc532
tree74defc825e1ca6af3a09869e689eb1007190f891
parenta3192aea354ae06603accbd99c5ea3d9f2e70102
parent895b26ad7806e5d8ed417686c80677e5ca0f5eb8
Merge branch 'fixes' into next

Merge our fixes branch again, this has a couple of build fixes and also
a change to do_syscall_trace_enter() that will conflict with a patch we
want to apply in next.
arch/powerpc/kernel/legacy_serial.c