diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-05 09:23:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-05 09:23:08 -0800 |
| commit | 7111fa1151e3c66cde3a94250bda72d7144419ff (patch) | |
| tree | 7504c625e0c4d79a9e417656be3485950e2ff513 /mm/memcontrol.c | |
| parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
| parent | 1173c3c28abfc3d7b7665db502280ba9322320e6 (diff) | |
Merge tag 'gpio-v5.4-4' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions