commit 6f2e9c3d28167b0f27d4be68e9101a9ecf397878
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 03 11:13:50 2020 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 03 11:13:50 2020 -0800
tree 32762989178f58b4182b8ceaef504748bed22d51
parent e35d0165908ad2d2bdb76773ef77b551763eedbd
parent 6da3eced8c5f3b03340b0c395bacd552c4d52411

Merge tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

Pull powerpc fixes from Michael Ellerman:
 "Two more powerpc fixes for 5.5:

   - One commit to fix a build error when CONFIG_JUMP_LABEL=n,
     introduced by our recent fix to is_shared_processor().

   - A commit marking some SLB related functions as notrace, as tracing
     them triggers warnings.

  Thanks to Jason A Donenfeld"

* tag 'powerpc-5.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/spinlocks: Include correct header for static key
  powerpc/mm: Mark get_slice_psize() & slice_addr_is_low() as notrace