diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-08 09:38:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-08 09:38:41 -0700 |
| commit | de70be0ae3c9283a7d16fd5fbdc03840f01065cf (patch) | |
| tree | 3b203c9a4ac59a7ecf2b3d0a8d4d326ca33bb076 /include | |
| parent | random: fix warning message on ia64 and parisc (diff) | |
| parent | scsi: sg: only check for dxfer_len greater than 256M (diff) | |
| download | linux-dev-de70be0ae3c9283a7d16fd5fbdc03840f01065cf.tar.xz linux-dev-de70be0ae3c9283a7d16fd5fbdc03840f01065cf.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two small fixes, one re-fix of a previous fix and five patches sorting
out hotplug in the bnx2X class of drivers. The latter is rather
involved, but necessary because these drivers have started dropping
lockdep recursion warnings on the hotplug lock because of its
conversion to a percpu rwsem"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: sg: only check for dxfer_len greater than 256M
scsi: aacraid: reading out of bounds
scsi: qedf: Limit number of CQs
scsi: bnx2i: Simplify cpu hotplug code
scsi: bnx2fc: Simplify CPU hotplug code
scsi: bnx2i: Prevent recursive cpuhotplug locking
scsi: bnx2fc: Prevent recursive cpuhotplug locking
scsi: bnx2fc: Plug CPU hotplug race
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpuhotplug.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index b56573bf440d..82b30e638430 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -39,8 +39,6 @@ enum cpuhp_state { CPUHP_PCI_XGENE_DEAD, CPUHP_IOMMU_INTEL_DEAD, CPUHP_LUSTRE_CFS_DEAD, - CPUHP_SCSI_BNX2FC_DEAD, - CPUHP_SCSI_BNX2I_DEAD, CPUHP_WORKQUEUE_PREP, CPUHP_POWER_NUMA_PREPARE, CPUHP_HRTIMERS_PREPARE, |