From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Nov 2019 17:23:08 +0000 (-0800)
Subject: Merge tag 'gpio-v5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7111fa1151e3c66cde3a94250bda72d7144419ff;p=linux.git

Merge tag 'gpio-v5.4-4' of git://git./linux/kernel/git/linusw/linux-gpio

Pull GPIO fixes from Linus Walleij:
 "More GPIO fixes! We found a late regression in the Intel Merrifield
  driver. Oh well. We fixed it up.

   - Fix a build error in the tools used for kselftest

   - A series of reverts to bring the Intel Merrifield back to working.

  We will likely unrevert the reverts for v5.5 but we can't have v5.4
  broken"

* tag 'gpio-v5.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  Revert "gpio: merrifield: Pass irqchip when adding gpiochip"
  Revert "gpio: merrifield: Restore use of irq_base"
  Revert "gpio: merrifield: Move hardware initialization to callback"
  tools: gpio: Use !building_out_of_srctree to determine srctree
---

7111fa1151e3c66cde3a94250bda72d7144419ff