From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2020 02:16:16 +0000 (-0800)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33c84e89abe4a92ab699c33029bd54269d574782;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'scsi-misc' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This series is slightly unusual because it includes Arnd's compat
  ioctl tree here:

    1c46a2cf2dbd Merge tag 'block-ioctl-cleanup-5.6' into 5.6/scsi-queue

  Excluding Arnd's changes, this is mostly an update of the usual
  drivers: megaraid_sas, mpt3sas, qla2xxx, ufs, lpfc, hisi_sas.

  There are a couple of core and base updates around error propagation
  and atomicity in the attribute container base we use for the SCSI
  transport classes.

  The rest is minor changes and updates"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (149 commits)
  scsi: hisi_sas: Rename hisi_sas_cq.pci_irq_mask
  scsi: hisi_sas: Add prints for v3 hw interrupt converge and automatic affinity
  scsi: hisi_sas: Modify the file permissions of trigger_dump to write only
  scsi: hisi_sas: Replace magic number when handle channel interrupt
  scsi: hisi_sas: replace spin_lock_irqsave/spin_unlock_restore with spin_lock/spin_unlock
  scsi: hisi_sas: use threaded irq to process CQ interrupts
  scsi: ufs: Use UFS device indicated maximum LU number
  scsi: ufs: Add max_lu_supported in struct ufs_dev_info
  scsi: ufs: Delete is_init_prefetch from struct ufs_hba
  scsi: ufs: Inline two functions into their callers
  scsi: ufs: Move ufshcd_get_max_pwr_mode() to ufshcd_device_params_init()
  scsi: ufs: Split ufshcd_probe_hba() based on its called flow
  scsi: ufs: Delete struct ufs_dev_desc
  scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails
  scsi: ufs-mediatek: enable low-power mode for hibern8 state
  scsi: ufs: export some functions for vendor usage
  scsi: ufs-mediatek: add dbg_register_dump implementation
  scsi: qla2xxx: Fix a NULL pointer dereference in an error path
  scsi: qla1280: Make checking for 64bit support consistent
  scsi: megaraid_sas: Update driver version to 07.713.01.00-rc1
  ...
---

33c84e89abe4a92ab699c33029bd54269d574782
diff --cc Documentation/core-api/index.rst
index ab0b9ec85506,3f28b2f668be..bc0c727d7fd8
--- a/Documentation/core-api/index.rst
+++ b/Documentation/core-api/index.rst
@@@ -39,7 -39,7 +39,8 @@@ Core utilitie
     ../RCU/index
     gcc-plugins
     symbol-namespaces
 +   padata
+    ioctl
  
  
  Interfaces for kernel debugging
diff --cc block/Makefile
index f6cef6d4363c,1f70c73ea83d..1a43750f4b01
--- a/block/Makefile
+++ b/block/Makefile
@@@ -25,10 -25,8 +25,9 @@@ obj-$(CONFIG_MQ_IOSCHED_KYBER)	+= kyber
  bfq-y				:= bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
  obj-$(CONFIG_IOSCHED_BFQ)	+= bfq.o
  
- obj-$(CONFIG_BLOCK_COMPAT)	+= compat_ioctl.o
  obj-$(CONFIG_BLK_CMDLINE_PARSER)	+= cmdline-parser.o
 -obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
 +obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o
 +obj-$(CONFIG_BLK_DEV_INTEGRITY_T10)	+= t10-pi.o
  obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o
  obj-$(CONFIG_BLK_MQ_VIRTIO)	+= blk-mq-virtio.o
  obj-$(CONFIG_BLK_MQ_RDMA)	+= blk-mq-rdma.o