Merge tag 'v4.13-rc1' into fixes
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Jul 2017 10:20:29 +0000 (20:20 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 31 Jul 2017 10:20:29 +0000 (20:20 +1000)
commitbb272221e9db79f13d454e1f3fb6b05013be985e
tree36f4acc50e3fabac71fadd34c720c0a6011db470
parent253fd51e2f533552ae35a0c661705da6c4842c1b
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877
Merge tag 'v4.13-rc1' into fixes

The fixes branch is based off a random pre-rc1 commit, because we had
some fixes that needed to go in before rc1 was released.

However we now need to fix some code that went in after that point, but
before rc1, so merge rc1 to get that code into fixes so we can fix it!
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/smp.c