On Mon, Nov 13, 2017 at 12:42:44PM -0800, Linus Torvalds wrote: > On Sun, Nov 12, 2017 at 11:31 PM, Ingo Molnar <mi...@kernel.org> wrote: > > > > Please pull the latest locking-core-for-linus git tree from: > > Ok, this clashed pretty badly with the s390 update which had big > locking changes to use the generic code. > > I tried to fix it all up, and maybe it's even ok. But it's also > entirely possible that I messed something up badly, and I don't have > an s390 build environment, so please, Heiko, can you look at the > result and send me any necessary fixes?
It compiles, boots, and the fixup looks good!