diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 15:57:56 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-21 15:57:56 -0800 | 
| commit | 2865936259e27629fac422bc80c9b55ca1f108a5 (patch) | |
| tree | fc246a8d4008c381303b1775872afd3b8008ccd2 /drivers/fpga/fpga-mgr.c | |
| parent | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (diff) | |
| parent | 9eb425b2e04e0e3006adffea5bf5f227a896f128 (diff) | |
Merge tag 'powerpc-5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
 "Some more powerpc fixes for 5.6. This is two weeks worth as I was out
  sick last week:
   - Three fixes for the recently added VMAP_STACK on 32-bit.
   - Three fixes related to hugepages on 8xx (32-bit).
   - A fix for a bug in our transactional memory handling that could
     lead to a kernel crash if we saw a page fault during signal
     delivery.
   - A fix for a deadlock in our PCI EEH (Enhanced Error Handling) code.
   - A couple of other minor fixes.
  Thanks to: Christophe Leroy, Erhard F, Frederic Barrat, Gustavo Luiz
  Duarte, Larry Finger, Leonardo Bras, Oliver O'Halloran, Sam Bobroff"
* tag 'powerpc-5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/entry: Fix an #if which should be an #ifdef in entry_32.S
  powerpc/xmon: Fix whitespace handling in getstring()
  powerpc/6xx: Fix power_save_ppc32_restore() with CONFIG_VMAP_STACK
  powerpc/chrp: Fix enter_rtas() with CONFIG_VMAP_STACK
  powerpc/32s: Fix DSI and ISI exceptions for CONFIG_VMAP_STACK
  powerpc/tm: Fix clearing MSR[TS] in current when reclaiming on signal delivery
  powerpc/8xx: Fix clearing of bits 20-23 in ITLB miss
  powerpc/hugetlb: Fix 8M hugepages on 8xx
  powerpc/hugetlb: Fix 512k hugepages on 8xx with 16k page size
  powerpc/eeh: Fix deadlock handling dead PHB
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions
