From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jan 2021 19:06:15 +0000 (-0800)
Subject: Merge branch 'parisc-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: xarray-5.12~452
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=76c057c84d286140c6c416c3b4ba832cd1d8984e;p=users%2Fwilly%2Fxarray.git

Merge branch 'parisc-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "Two small fixes:

   - Fix linking error with 64-bit kernel when modules are disabled,
     reported by kernel test robot

   - Remove leftover reference to power_tasklet, by Davidlohr Bueso"

* 'parisc-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Enable -mlong-calls gcc option by default when !CONFIG_MODULES
  parisc: Remove leftover reference to the power_tasklet
---

76c057c84d286140c6c416c3b4ba832cd1d8984e