From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Jun 2018 18:10:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v5.4.17~5861
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d6c7528447dec208f9b742ede047753584528c0a;p=arm%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

Pull IDE updates from David Miller:
 "Primarily IRQ disabling avoidance changes from Sebastian Andrzej
  Siewior"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: don't enable/disable interrupts in force threaded-IRQ mode
  ide: don't disable interrupts during kmap_atomic()
  ide: Handle irq disabling consistently
  alim15x3: move irq-restore before pci_dev_put()
---

d6c7528447dec208f9b742ede047753584528c0a