OSDN Git Service

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)
commit4d6a19827387d8448afa1f5959b809ed2ba090d6
tree74defc825e1ca6af3a09869e689eb1007190f891
parent7c91efce1608325634494b25ff6491320208e457
parenta225f1567405558fb5410e9b2b90805819df1c67
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