1. 15 11月, 2017 22 次提交
    • L
      Merge tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 4e4510fe
      Linus Torvalds 提交于
      Pull sound updates from Takashi Iwai:
       "There are no big surprising changes in this cycle, yet not too boring,
        either. The biggest change from diffstat POV is the removal of the
        legacy OSS driver codes that have been already disabled for a long
        time. This will bring a few trivial merge conflicts.
      
        As new features in ASoC side, there are two things: a new AC97 bus
        implementation and AMD Stony platform support. Both include the
        relevant changes shared with other subsystems, e.g. AC97 MFD changes
        and DRM AMD changes.
      
        Some other highlighted topics are:
      
         - A bunch of USB-audio drivers got the hardening against the
           malicious device accesses with a new helper code for endpoint
           sanity check
      
         - Lots of cleanups for ASoC Intel platform code, including support
           for their open source audio firmware
      
         - Continued ASoC core componentization works
      
         - Support for scaling MCLK with sample rate in ASoC simple-card
      
         - Stabler PCM hot-unplug capability, especially for ASoC usages"
      
      * tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (302 commits)
        Documentation: sound: hd-audio: notes.rst
        ASoC: bcm2835: Support left/right justified and DSP modes
        ASoC: bcm2835: Enforce full symmetry
        ASoC: bcm2835: Support additional samplerates up to 384kHz
        ASoC: bcm2835: Add support for TDM modes
        ASoC: add mclk-fs support to audio graph card
        ASoC: add mclk-fs to audio graph card binding
        ASoC: rt5514: work around link error
        ASoC: rt5514: mark PM functions as __maybe_unused
        ASoC: rt5663: Check the JD status in the button pushing
        ASoC: amd: Modified DMA transfer Mechanism for Playback
        ASoC: rt5645: Wait for 400msec before concluding on value of RT5645_VENDOR_ID2
        ASoC: sun4i-codec: fixed 32bit audio capture support for H3/H2+
        ASoC: da7213: add support for DSP modes
        ASoC: sun8i-codec: Add a comment on the LRCK inversion
        ASoC: sun8i-codec: Set the BCLK divider
        ASoC: rt5663: Delay and retry reading rt5663 ID register
        ASoC: amd: use do_div rather than 64 bit division to fix 32 bit builds
        ASoC: cs42l56: Fix reset GPIO name in example DT binding
        ASoC: rt5514-spi: check irq status to schedule data copy in resume function
        ...
      4e4510fe
    • L
      Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 4008e6a9
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
       "This contains two bigger than usual tree-wide changes this time. They
        all have proper acks, caused no merge conflicts in linux-next where
        they have been for a while. They are namely:
      
         - to-gpiod conversion of the i2c-gpio driver and its users (touching
           arch/* and drivers/mfd/*)
      
         - adding a sbs-manager based on I2C core updates to SMBus alerts
           (touching drivers/power/*)
      
        Other notable changes:
      
         - i2c_boardinfo can now carry a dev_name to be used when the device
           is created. This is because some devices in ACPI world need fixed
           names to find the regulators.
      
         - the designware driver got a long discussed overhaul of its PM
           handling. img-scb and davinci got PM support, too.
      
         - at24 driver has way better OF support. And it has a new maintainer.
           Thanks Bartosz for stepping up!
      
        The rest is regular driver updates and fixes"
      
      * 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (55 commits)
        ARM: sa1100: simpad: Correct I2C GPIO offsets
        i2c: aspeed: Deassert reset in probe
        eeprom: at24: Add OF device ID table
        MAINTAINERS: new maintainer for AT24 driver
        i2c: nuc900: remove platform_data, too
        i2c: thunderx: Remove duplicate NULL check
        i2c: taos-evm: Remove duplicate NULL check
        i2c: Make i2c_unregister_device() NULL-aware
        i2c: xgene-slimpro: Support v2
        i2c: mpc: remove useless variable initialization
        i2c: omap: Trigger bus recovery in lockup case
        i2c: gpio: Add support for named gpios in DT
        dt-bindings: i2c: i2c-gpio: Add support for named gpios
        i2c: gpio: Local vars in probe
        i2c: gpio: Augment all boardfiles to use open drain
        i2c: gpio: Enforce open drain through gpiolib
        gpio: Make it possible for consumers to enforce open drain
        i2c: gpio: Convert to use descriptors
        power: supply: sbs-message: fix some code style issues
        power: supply: sbs-battery: remove unchecked return var
        ...
      4008e6a9
    • L
      Merge tag 'gpio-v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 6aa2f944
      Linus Torvalds 提交于
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.15 kernel cycle:
      
        Core:
      
         - Fix the semantics of raw GPIO to actually be raw. No inversion
           semantics as before, but also no open draining, and allow the raw
           operations to affect lines used for interrupts as the caller
           supposedly knows what they are doing if they are getting the big
           hammer.
      
         - Rewrote the __inner_function() notation calls to names that make
           more sense. I just find this kind of code disturbing.
      
         - Drop the .irq_base() field from the gpiochip since now all IRQs are
           mapped dynamically. This is nice.
      
         - Support for .get_multiple() in the core driver API. This allows us
           to read several GPIO lines with a single register read. This has
           high value for some usecases: it can be used to create
           oscilloscopes and signal analyzers and other things that rely on
           reading several lines at exactly the same instant. Also a generally
           nice optimization. This uses the new assign_bit() macro from the
           bitops lib that was ACKed by Andrew Morton and is implemented for
           two drivers, one of them being the generic MMIO driver so everyone
           using that will be able to benefit from this.
      
         - Do not allow requests of Open Drain and Open Source setting of a
           GPIO line simultaneously. If the hardware actually supports
           enabling both at the same time the electrical result would be
           disastrous.
      
         - A new interrupt chip core helper. This will be helpful to deal with
           "banked" GPIOs, which means GPIO controllers with several logical
           blocks of GPIO inside them. This is several gpiochips per device in
           the device model, in contrast to the case when there is a 1-to-1
           relationship between a device and a gpiochip.
      
        New drivers:
      
         - Maxim MAX3191x industrial serializer, a very interesting piece of
           professional I/O hardware.
      
         - Uniphier GPIO driver. This is the GPIO block from the recent
           Socionext (ex Fujitsu and Panasonic) platform.
      
         - Tegra 186 driver. This is based on the new banked GPIO
           infrastructure.
      
        Other improvements:
      
         - Some documentation improvements.
      
         - Wakeup support for the DesignWare DWAPB GPIO controller.
      
         - Reset line support on the DesignWare DWAPB GPIO controller.
      
         - Several non-critical bug fixes and improvements for the Broadcom
           BRCMSTB driver.
      
         - Misc non-critical bug fixes like exotic errorpaths, removal of dead
           code etc.
      
         - Explicit comments on fall-through switch() statements"
      
      * tag 'gpio-v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (65 commits)
        gpio: tegra186: Remove tegra186_gpio_lock_class
        gpio: rcar: Add r8a77995 (R-Car D3) support
        pinctrl: bcm2835: Fix some merge fallout
        gpio: Fix undefined lock_dep_class
        gpio: Automatically add lockdep keys
        gpio: Introduce struct gpio_irq_chip.first
        gpio: Disambiguate struct gpio_irq_chip.nested
        gpio: Add Tegra186 support
        gpio: Export gpiochip_irq_{map,unmap}()
        gpio: Implement tighter IRQ chip integration
        gpio: Move lock_key into struct gpio_irq_chip
        gpio: Move irq_valid_mask into struct gpio_irq_chip
        gpio: Move irq_nested into struct gpio_irq_chip
        gpio: Move irq_chained_parent to struct gpio_irq_chip
        gpio: Move irq_default_type to struct gpio_irq_chip
        gpio: Move irq_handler to struct gpio_irq_chip
        gpio: Move irqdomain into struct gpio_irq_chip
        gpio: Move irqchip into struct gpio_irq_chip
        gpio: Introduce struct gpio_irq_chip
        pinctrl: armada-37xx: remove unused variable
        ...
      6aa2f944
    • L
      Merge tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping · e37e0ee0
      Linus Torvalds 提交于
      Pull dma-mapping updates from Christoph Hellwig:
      
       - turn dma_cache_sync into a dma_map_ops instance and remove
         implementation that purely are dead because the architecture doesn't
         support noncoherent allocations
      
       - add a flag for busses that need DMA configuration (Robin Murphy)
      
      * tag 'dma-mapping-4.15' of git://git.infradead.org/users/hch/dma-mapping:
        dma-mapping: turn dma_cache_sync into a dma_map_ops method
        sh: make dma_cache_sync a no-op
        xtensa: make dma_cache_sync a no-op
        unicore32: make dma_cache_sync a no-op
        powerpc: make dma_cache_sync a no-op
        mn10300: make dma_cache_sync a no-op
        microblaze: make dma_cache_sync a no-op
        ia64: make dma_cache_sync a no-op
        frv: make dma_cache_sync a no-op
        x86: make dma_cache_sync a no-op
        floppy: consolidate the dummy fd_cacheflush definition
        drivers: flag buses which demand DMA configuration
      e37e0ee0
    • L
      Merge tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 23c25876
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
       "Updates for this cycle include:
      
         - new driver for Spreadtrum dma controller, ST MDMA and DMAMUX
           controllers
      
         - PM support for IMG MDC drivers
      
         - updates to bcm-sba-raid driver and improvements to sun6i driver
      
         - subsystem conversion for:
            - timers to use timer_setup()
            - remove usage of PCI pool API
            - usage of %p format specifier
      
         - minor updates to bunch of drivers"
      
      * tag 'dmaengine-4.15-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (49 commits)
        dmaengine: ti-dma-crossbar: Correct am335x/am43xx mux value type
        dmaengine: dmatest: warn user when dma test times out
        dmaengine: Revert "rcar-dmac: use TCRB instead of TCR for residue"
        dmaengine: stm32_mdma: activate pack/unpack feature
        dmaengine: at_hdmac: Remove unnecessary 0x prefixes before %pad
        dmaengine: coh901318: Remove unnecessary 0x prefixes before %pad
        MAINTAINERS: Step down from a co-maintaner of DW DMAC driver
        dmaengine: pch_dma: Replace PCI pool old API
        dmaengine: Convert timers to use timer_setup()
        dmaengine: sprd: Add Spreadtrum DMA driver
        dt-bindings: dmaengine: Add Spreadtrum SC9860 DMA controller
        dmaengine: sun6i: Retrieve channel count/max request from devicetree
        dmaengine: Build bcm-sba-raid driver as loadable module for iProc SoCs
        dmaengine: bcm-sba-raid: Use common GPL comment header
        dmaengine: bcm-sba-raid: Use only single mailbox channel
        dmaengine: bcm-sba-raid: serialize dma_cookie_complete() using reqs_lock
        dmaengine: pl330: fix descriptor allocation fail
        dmaengine: rcar-dmac: use TCRB instead of TCR for residue
        dmaengine: sun6i: Add support for Allwinner A64 and compatibles
        arm64: allwinner: a64: Add devicetree binding for DMA controller
        ...
      23c25876
    • L
      Merge tag 'vfio-v4.15-rc1' of git://github.com/awilliam/linux-vfio · e0ca3826
      Linus Torvalds 提交于
      Pull VFIO updates from Alex Williamson:
      
       - Virtualize PCI MPS and MRRS registers
      
       - Avoid soft lockups on SPAPR when clearing TCE
      
       - Broadcom FlexRM platform device support
      
       - Samples driver cleanup & type1 integer overflow fix
      
      * tag 'vfio-v4.15-rc1' of git://github.com/awilliam/linux-vfio:
        vfio: platform: reset: Add Broadcom FlexRM reset module
        vfio/type1: silence integer overflow warning
        vfio-mdev/samples: make mdev_fops const and static
        vfio/spapr: Add cond_resched() for huge updates
        vfio/pci: Virtualize Maximum Read Request Size
        vfio/pci: Virtualize Maximum Payload Size
      e0ca3826
    • L
      Merge tag 'iommu-v4.15-rc1' of git://github.com/awilliam/linux-vfio · 2cd83ba5
      Linus Torvalds 提交于
      Pull IOMMU updates from Alex Williamson:
       "As Joerg mentioned[1], he's out on paternity leave through the end of
        the year and I'm filling in for him in the interim:
      
         - Enforce MSI multiple IRQ alignment in AMD IOMMU
      
         - VT-d PASID error handling fixes
      
         - Add r8a7795 IPMMU support
      
         - Manage runtime PM links on exynos at {add,remove}_device callbacks
      
         - Fix Mediatek driver name to avoid conflict
      
         - Add terminate support to qcom fault handler
      
         - 64-bit IOVA optimizations
      
         - Simplfy IOVA domain destruction, better use of rcache, and skip
           anchor nodes on copy
      
         - Convert to IOMMU TLB sync API in io-pgtable-arm{-v7s}
      
         - Drop command queue lock when waiting for CMD_SYNC completion on ARM
           SMMU implementations supporting MSI to cacheable memory
      
         - iomu-vmsa cleanup inspired by missed IOTLB sync callbacks
      
         - Fix sleeping lock with preemption disabled for RT
      
         - Dual MMU support for TI DRA7xx DSPs
      
         - Optional flush option on IOVA allocation avoiding overhead when
           caller can try other options
      
        [1] https://lkml.org/lkml/2017/10/22/72"
      
      * tag 'iommu-v4.15-rc1' of git://github.com/awilliam/linux-vfio: (54 commits)
        iommu/iova: Use raw_cpu_ptr() instead of get_cpu_ptr() for ->fq
        iommu/mediatek: Fix driver name
        iommu/ipmmu-vmsa: Hook up r8a7795 DT matching code
        iommu/ipmmu-vmsa: Allow two bit SL0
        iommu/ipmmu-vmsa: Make IMBUSCTR setup optional
        iommu/ipmmu-vmsa: Write IMCTR twice
        iommu/ipmmu-vmsa: IPMMU device is 40-bit bus master
        iommu/ipmmu-vmsa: Make use of IOMMU_OF_DECLARE()
        iommu/ipmmu-vmsa: Enable multi context support
        iommu/ipmmu-vmsa: Add optional root device feature
        iommu/ipmmu-vmsa: Introduce features, break out alias
        iommu/ipmmu-vmsa: Unify ipmmu_ops
        iommu/ipmmu-vmsa: Clean up struct ipmmu_vmsa_iommu_priv
        iommu/ipmmu-vmsa: Simplify group allocation
        iommu/ipmmu-vmsa: Unify domain alloc/free
        iommu/ipmmu-vmsa: Fix return value check in ipmmu_find_group_dma()
        iommu/vt-d: Clear pasid table entry when memory unbound
        iommu/vt-d: Clear Page Request Overflow fault bit
        iommu/vt-d: Missing checks for pasid tables if allocation fails
        iommu/amd: Limit the IOVA page range to the specified addresses
        ...
      2cd83ba5
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 670ffccb
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas,
        megaraid_sas, pm80xx, mpt3sas, be2iscsi, hpsa. and a host of minor
        updates.
      
        There's no major behaviour change or additions to the core in all of
        this, so the potential for regressions should be small (biggest
        potential being in the scsi error handler changes)"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
        scsi: lpfc: Fix hard lock up NMI in els timeout handling.
        scsi: mpt3sas: remove a stray KERN_INFO
        scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event()
        scsi: aacraid: use timespec64 instead of timeval
        scsi: scsi_transport_fc: add 64GBIT and 128GBIT port speed definitions
        scsi: qla2xxx: Suppress a kernel complaint in qla_init_base_qpair()
        scsi: mpt3sas: fix dma_addr_t casts
        scsi: be2iscsi: Use kasprintf
        scsi: storvsc: Avoid excessive host scan on controller change
        scsi: lpfc: fix kzalloc-simple.cocci warnings
        scsi: mpt3sas: Update mpt3sas driver version.
        scsi: mpt3sas: Fix sparse warnings
        scsi: mpt3sas: Fix nvme drives checking for tlr.
        scsi: mpt3sas: NVMe drive support for BTDHMAPPING ioctl command and log info
        scsi: mpt3sas: Add-Task-management-debug-info-for-NVMe-drives.
        scsi: mpt3sas: scan and add nvme device after controller reset
        scsi: mpt3sas: Set NVMe device queue depth as 128
        scsi: mpt3sas: Handle NVMe PCIe device related events generated from firmware.
        scsi: mpt3sas: API's to remove nvme drive from sml
        scsi: mpt3sas: API 's to support NVMe drive addition to SML
        ...
      670ffccb
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md · 47f521ba
      Linus Torvalds 提交于
      Pull MD update from Shaohua Li:
       "This update mostly includes bug fixes:
      
         - md-cluster now supports raid10 from Guoqing
      
         - raid5 PPL fixes from Artur
      
         - badblock regression fix from Bo
      
         - suspend hang related fixes from Neil
      
         - raid5 reshape fixes from Neil
      
         - raid1 freeze deadlock fix from Nate
      
         - memleak fixes from Zdenek
      
         - bitmap related fixes from Me and Tao
      
         - other fixes and cleanups"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md: (33 commits)
        md: free unused memory after bitmap resize
        md: release allocated bitset sync_set
        md/bitmap: clear BITMAP_WRITE_ERROR bit before writing it to sb
        md: be cautious about using ->curr_resync_completed for ->recovery_offset
        badblocks: fix wrong return value in badblocks_set if badblocks are disabled
        md: don't check MD_SB_CHANGE_CLEAN in md_allow_write
        md-cluster: update document for raid10
        md: remove redundant variable q
        raid1: remove obsolete code in raid1_write_request
        md-cluster: Use a small window for raid10 resync
        md-cluster: Suspend writes in RAID10 if within range
        md-cluster/raid10: set "do_balance = 0" if area is resyncing
        md: use lockdep_assert_held
        raid1: prevent freeze_array/wait_all_barriers deadlock
        md: use TASK_IDLE instead of blocking signals
        md: remove special meaning of ->quiesce(.., 2)
        md: allow metadata update while suspending.
        md: use mddev_suspend/resume instead of ->quiesce()
        md: move suspend_hi/lo handling into core md code
        md: don't call bitmap_create() while array is quiesced.
        ...
      47f521ba
    • L
      Merge tag 'for-4.15/dm' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · b91593fa
      Linus Torvalds 提交于
      Pull device mapper updates from Mike Snitzer:
      
       - a few conversions from atomic_t to ref_count_t
      
       - a DM core fix for a race during device destruction that could result
         in a BUG_ON
      
       - a stable@ fix for a DM cache race condition that could lead to data
         corruption when operating in writeback mode (writethrough is default)
      
       - various DM cache cleanups and improvements
      
       - add DAX support to the DM log-writes target
      
       - a fix for the DM zoned target's ability to deal with the last zone of
         the drive being smaller than all others
      
       - a stable@ DM crypt and DM integrity fix for a negative check that was
         to restrictive (prevented slab debug with XFS ontop of DM crypt from
         working)
      
       - a DM raid target fix for a panic that can occur when forcing a raid
         to sync
      
      * tag 'for-4.15/dm' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (25 commits)
        dm cache: lift common migration preparation code to alloc_migration()
        dm cache: remove usused deferred_cells member from struct cache
        dm cache policy smq: allocate cache blocks in order
        dm cache policy smq: change max background work from 10240 to 4096 blocks
        dm cache background tracker: limit amount of background work that may be issued at once
        dm cache policy smq: take origin idle status into account when queuing writebacks
        dm cache policy smq: handle races with queuing background_work
        dm raid: fix panic when attempting to force a raid to sync
        dm integrity: allow unaligned bv_offset
        dm crypt: allow unaligned bv_offset
        dm: small cleanup in dm_get_md()
        dm: fix race between dm_get_from_kobject() and __dm_destroy()
        dm: allocate struct mapped_device with kvzalloc
        dm zoned: ignore last smaller runt zone
        dm space map metadata: use ARRAY_SIZE
        dm log writes: add support for DAX
        dm log writes: add support for inline data buffers
        dm cache: simplify get_per_bio_data() by removing data_size argument
        dm cache: remove all obsolete writethrough-specific code
        dm cache: submit writethrough writes in parallel to origin and cache
        ...
      b91593fa
    • L
      Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block · e2c5923c
      Linus Torvalds 提交于
      Pull core block layer updates from Jens Axboe:
       "This is the main pull request for block storage for 4.15-rc1.
      
        Nothing out of the ordinary in here, and no API changes or anything
        like that. Just various new features for drivers, core changes, etc.
        In particular, this pull request contains:
      
         - A patch series from Bart, closing the whole on blk/scsi-mq queue
           quescing.
      
         - A series from Christoph, building towards hidden gendisks (for
           multipath) and ability to move bio chains around.
      
         - NVMe
              - Support for native multipath for NVMe (Christoph).
              - Userspace notifications for AENs (Keith).
              - Command side-effects support (Keith).
              - SGL support (Chaitanya Kulkarni)
              - FC fixes and improvements (James Smart)
              - Lots of fixes and tweaks (Various)
      
         - bcache
              - New maintainer (Michael Lyle)
              - Writeback control improvements (Michael)
              - Various fixes (Coly, Elena, Eric, Liang, et al)
      
         - lightnvm updates, mostly centered around the pblk interface
           (Javier, Hans, and Rakesh).
      
         - Removal of unused bio/bvec kmap atomic interfaces (me, Christoph)
      
         - Writeback series that fix the much discussed hundreds of millions
           of sync-all units. This goes all the way, as discussed previously
           (me).
      
         - Fix for missing wakeup on writeback timer adjustments (Yafang
           Shao).
      
         - Fix laptop mode on blk-mq (me).
      
         - {mq,name} tupple lookup for IO schedulers, allowing us to have
           alias names. This means you can use 'deadline' on both !mq and on
           mq (where it's called mq-deadline). (me).
      
         - blktrace race fix, oopsing on sg load (me).
      
         - blk-mq optimizations (me).
      
         - Obscure waitqueue race fix for kyber (Omar).
      
         - NBD fixes (Josef).
      
         - Disable writeback throttling by default on bfq, like we do on cfq
           (Luca Miccio).
      
         - Series from Ming that enable us to treat flush requests on blk-mq
           like any other request. This is a really nice cleanup.
      
         - Series from Ming that improves merging on blk-mq with schedulers,
           getting us closer to flipping the switch on scsi-mq again.
      
         - BFQ updates (Paolo).
      
         - blk-mq atomic flags memory ordering fixes (Peter Z).
      
         - Loop cgroup support (Shaohua).
      
         - Lots of minor fixes from lots of different folks, both for core and
           driver code"
      
      * 'for-4.15/block' of git://git.kernel.dk/linux-block: (294 commits)
        nvme: fix visibility of "uuid" ns attribute
        blk-mq: fixup some comment typos and lengths
        ide: ide-atapi: fix compile error with defining macro DEBUG
        blk-mq: improve tag waiting setup for non-shared tags
        brd: remove unused brd_mutex
        blk-mq: only run the hardware queue if IO is pending
        block: avoid null pointer dereference on null disk
        fs: guard_bio_eod() needs to consider partitions
        xtensa/simdisk: fix compile error
        nvme: expose subsys attribute to sysfs
        nvme: create 'slaves' and 'holders' entries for hidden controllers
        block: create 'slaves' and 'holders' entries for hidden gendisks
        nvme: also expose the namespace identification sysfs files for mpath nodes
        nvme: implement multipath access to nvme subsystems
        nvme: track shared namespaces
        nvme: introduce a nvme_ns_ids structure
        nvme: track subsystems
        block, nvme: Introduce blk_mq_req_flags_t
        block, scsi: Make SCSI quiesce and resume work reliably
        block: Add the QUEUE_FLAG_PREEMPT_ONLY request queue flag
        ...
      e2c5923c
    • L
      Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs · abc36be2
      Linus Torvalds 提交于
      Pull configfs updates from Christoph Hellwig:
       "A couple of configfs cleanups:
      
         - proper use of the bool type (Thomas Meyer)
      
         - constification of struct config_item_type (Bhumika Goyal)"
      
      * tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs:
        RDMA/cma: make config_item_type const
        stm class: make config_item_type const
        ACPI: configfs: make config_item_type const
        nvmet: make config_item_type const
        usb: gadget: configfs: make config_item_type const
        PCI: endpoint: make config_item_type const
        iio: make function argument and some structures const
        usb: gadget: make config_item_type structures const
        dlm: make config_item_type const
        netconsole: make config_item_type const
        nullb: make config_item_type const
        ocfs2/cluster: make config_item_type const
        target: make config_item_type const
        configfs: make ci_type field, some pointers and function arguments const
        configfs: make config_item_type const
        configfs: Fix bool initialization/comparison
      abc36be2
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · f14fc0cc
      Linus Torvalds 提交于
      Pull quota, ext2, isofs and udf fixes from Jan Kara:
      
       - two small quota error handling fixes
      
       - two isofs fixes for architectures with signed char
      
       - several udf block number overflow and signedness fixes
      
       - ext2 rework of mount option handling to avoid GFP_KERNEL allocation
         with spinlock held
      
       - ... it also contains a patch to implement auditing of responses to
         fanotify permission events. That should have been in the fanotify
         pull request but I mistakenly merged that patch into a wrong branch
         and noticed only now at which point I don't think it's worth rebasing
         and redoing.
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: be aware of error from dquot_initialize
        quota: fix potential infinite loop
        isofs: use unsigned char types consistently
        isofs: fix timestamps beyond 2027
        udf: Fix some sign-conversion warnings
        udf: Fix signed/unsigned format specifiers
        udf: Fix 64-bit sign extension issues affecting blocks > 0x7FFFFFFF
        udf: Remove some outdate references from documentation
        udf: Avoid overflow when session starts at large offset
        ext2: Fix possible sleep in atomic during mount option parsing
        ext2: Parse mount options into a dedicated structure
        audit: Record fanotify access control decisions
      f14fc0cc
    • L
      Merge branch 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 23281c80
      Linus Torvalds 提交于
      Pull fsnotify updates from Jan Kara:
      
       - fixes of use-after-tree issues when handling fanotify permission
         events from Miklos
      
       - refcount_t conversions from Elena
      
       - fixes of ENOMEM handling in dnotify and fsnotify from me
      
      * 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: convert fsnotify_mark.refcnt from atomic_t to refcount_t
        fanotify: clean up CONFIG_FANOTIFY_ACCESS_PERMISSIONS ifdefs
        fsnotify: clean up fsnotify()
        fanotify: fix fsnotify_prepare_user_wait() failure
        fsnotify: fix pinning group in fsnotify_prepare_user_wait()
        fsnotify: pin both inode and vfsmount mark
        fsnotify: clean up fsnotify_prepare/finish_user_wait()
        fsnotify: convert fsnotify_group.refcnt from atomic_t to refcount_t
        fsnotify: Protect bail out path of fsnotify_add_mark_locked() properly
        dnotify: Handle errors from fsnotify_add_mark_locked() in fcntl_dirnotify()
      23281c80
    • L
      Merge tag 'dlm-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · f0b60bfa
      Linus Torvalds 提交于
      Pull dlm updates from David Teigland:
       "This set focuses, as usual, on fixes to the comms layer.
      
        New testing of the dlm with ocfs2 uncovered a number of bugs in the
        TCP connection handling during recovery, starting, and stopping"
      
      * tag 'dlm-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: remove dlm_send_rcom_lookup_dump
        dlm: recheck kthread_should_stop() before schedule()
        DLM: fix NULL pointer dereference in send_to_sock()
        DLM: fix to reschedule rwork
        DLM: fix to use sk_callback_lock correctly
        DLM: fix overflow dlm_cb_seq
        DLM: fix memory leak in tcp_accept_from_sock()
        DLM: fix conversion deadlock when DLM_LKF_NODLCKWT flag is set
        DLM: use CF_CLOSE flag to stop dlm_send correctly
        DLM: Reanimate CF_WRITE_PENDING flag
        DLM: fix race condition between dlm_recoverd_stop and dlm_recoverd
        DLM: close othercon at send/receive error
        DLM: retry rcom when dlm_wait_function is timed out.
        DLM: fix to use sock_mutex correctly in xxx_accept_from_sock
        DLM: fix race condition between dlm_send and dlm_recv
        DLM: fix double list_del()
        DLM: fix remove save_cb argument from add_sock()
        DLM: Fix saving of NULL callbacks
        DLM: Eliminate CF_WRITE_PENDING flag
        DLM: Eliminate CF_CONNECT_PENDING flag
      f0b60bfa
    • L
      Merge tag 'gfs2-4.15.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 29309a4e
      Linus Torvalds 提交于
      Pull gfs2 updates from Bob Peterson:
       "We've got a total of 17 GFS2 patches for this merge window. The
        patches are basically in three categories: (1) patches related to
        broken xfstest cases, (2) patches related to improving iomap and start
        using it in GFS2, and (3) general typos and clarifications.
      
        Please note that one of the iomap patches extends beyond GFS2 and
        affects other file systems, but it was publically reviewed by a
        variety of file system people in the community.
      
        From Andreas Gruenbacher:
      
         - rename variable 'bsize' to 'factor' to clarify the logic related to
           gfs2_block_map.
      
         - correctly set ctime in the setflags ioctl, which fixes broken
           xfstests test 277.
      
         - fix broken xfstest 258, due to an atime initialization problem.
      
         - fix broken xfstest 307, in which GFS2 was not setting ctime when
           setting acls.
      
         - switch general iomap code from blkno to disk offset for a variety
           of file systems.
      
         - add a new IOMAP_F_DATA_INLINE flag for iomap to indicate blocks
           that have data mixed with metadata.
      
         - implement SEEK_HOLE and SEEK_DATA via iomap in GFS2.
      
         - fix failing xfstest case 066, which was due to not properly syncing
           dirty inodes when changing extended attributes.
      
         - fix a minor typo in a comment.
      
         - partially fix xfstest 424, which involved GET_FLAGS and SET_FLAGS
           ioctl. This is also a cleanup and simplification of the translation
           of flags from fs flags to gfs2 flags.
      
         - add support for STATX_ATTR_ in statx, which fixed broken xfstest
           424.
      
         - fix for failing xfstest 093 which fixes a recursive glock problem
           with gfs2_xattr_get and _set
      
        From me:
      
         - make inode height info part of the 'metapath' data structure to
           facilitate using iomap in GFS2.
      
         - start using iomap inside GFS2 and switch GFS2's block_map functions
           to use iomap under the covers.
      
         - switch GFS2's fiemap implementation from using block_map to using
           iomap under the covers.
      
         - fix journaled data pages not being properly synced to media when
           writing inodes. This was caught with xfstests.
      
         - fix another failing xfstest case in which switching a file from
           ordered_write to journaled data via set_flags caused a deadlock"
      
      * tag 'gfs2-4.15.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Allow gfs2_xattr_set to be called with the glock held
        gfs2: Add support for statx inode flags
        gfs2: Fix and clean up {GET,SET}FLAGS ioctl
        gfs2: Fix a harmless typo
        gfs2: Fix xattr fsync
        GFS2: Take inode off order_write list when setting jdata flag
        GFS2: flush the log and all pages for jdata as we do for WB_SYNC_ALL
        gfs2: Implement SEEK_HOLE / SEEK_DATA via iomap
        GFS2: Switch fiemap implementation to use iomap
        GFS2: Implement iomap for block_map
        GFS2: Make height info part of metapath
        gfs2: Always update inode ctime in set_acl
        gfs2: Support negative atimes
        gfs2: Update ctime in setflags ioctl
        gfs2: Clarify gfs2_block_map
      29309a4e
    • L
      Merge tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy · ac446dcc
      Linus Torvalds 提交于
      Pull jfs updates from David Kleikamp:
       "A couple small fixes for jfs"
      
      * tag 'jfs-4.15' of git://github.com/kleikamp/linux-shaggy:
        jfs: Add missing NULL pointer check in __get_metapage
        jfs: remove increment of i_version counter
      ac446dcc
    • L
      Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 5cea7647
      Linus Torvalds 提交于
      Pull btrfs updates from David Sterba:
       "There are some new user features and the usual load of invisible
        enhancements or cleanups.
      
        New features:
      
         - extend mount options to specify zlib compression level, -o
           compress=zlib:9
      
         - v2 of ioctl "extent to inode mapping", addressing a usecase where
           we want to retrieve more but inaccurate results and do the
           postprocessing in userspace, aiding defragmentation or
           deduplication tools
      
         - populate compression heuristics logic, do data sampling and try to
           guess compressibility by: looking for repeated patterns, counting
           unique byte values and distribution, calculating Shannon entropy;
           this will need more benchmarking and possibly fine tuning, but the
           base should be good enough
      
         - enable indexing for btrfs as lower filesystem in overlayfs
      
         - speedup page cache readahead during send on large files
      
        Internal enhancements:
      
         - more sanity checks of b-tree items when reading them from disk
      
         - more EINVAL/EUCLEAN fixups, missing BLK_STS_* conversion, other
           errno or error handling fixes
      
         - remove some homegrown IO-related logic, that's been obsoleted by
           core block layer changes (batching, plug/unplug, own counters)
      
         - add ref-verify, optional debugging feature to verify extent
           reference accounting
      
         - simplify code handling outstanding extents, make it more clear
           where and how the accounting is done
      
         - make delalloc reservations per-inode, simplify the code and make
           the logic more straightforward
      
         - extensive cleanup of delayed refs code
      
        Notable fixes:
      
         - fix send ioctl on 32bit with 64bit kernel"
      
      * 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (102 commits)
        btrfs: Fix bug for misused dev_t when lookup in dev state hash table.
        Btrfs: heuristic: add Shannon entropy calculation
        Btrfs: heuristic: add byte core set calculation
        Btrfs: heuristic: add byte set calculation
        Btrfs: heuristic: add detection of repeated data patterns
        Btrfs: heuristic: implement sampling logic
        Btrfs: heuristic: add bucket and sample counters and other defines
        Btrfs: compression: separate heuristic/compression workspaces
        btrfs: move btrfs_truncate_block out of trans handle
        btrfs: don't call btrfs_start_delalloc_roots in flushoncommit
        btrfs: track refs in a rb_tree instead of a list
        btrfs: add a comp_refs() helper
        btrfs: switch args for comp_*_refs
        btrfs: make the delalloc block rsv per inode
        btrfs: add tracepoints for outstanding extents mods
        Btrfs: rework outstanding_extents
        btrfs: increase output size for LOGICAL_INO_V2 ioctl
        btrfs: add a flags argument to LOGICAL_INO and call it LOGICAL_INO_V2
        btrfs: add a flag to iterate_inodes_from_logical to find all extent refs for uncompressed extents
        btrfs: send: remove unused code
        ...
      5cea7647
    • L
      Merge tag 'xfs-4.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 808eb24e
      Linus Torvalds 提交于
      Pull xfs updates from Darrick Wong:
       "xfs: great scads of new stuff for 4.15.
      
        This merge cycle, we're making some substantive changes to XFS. The
        in-core extent mappings have been refactored to use proper iterators
        and a btree to handle heavily fragmented files without needing
        high-order memory allocations; some important log recovery bug fixes;
        and the first part of the online fsck functionality.
      
        (The online fsck feature is disabled by default and more pieces of it
        will be coming in future release cycles.)
      
        This giant pile of patches has been run through a full xfstests run
        over the weekend and through a quick xfstests run against this
        morning's master, with no major failures reported.
      
        New in this version:
      
         - Refactor the incore extent map manipulations to use a cursor
           instead of directly modifying extent data.
      
         - Refactor the incore extent map cursor to use an in-memory btree
           instead of a single high-order allocation. This eliminates a major
           source of complaints about insufficient memory when opening a
           heavily fragmented file into a system whose memory is also heavily
           fragmented.
      
         - Fix a longstanding bug where deleting a file with a complex
           extended attribute btree incorrectly handled memory pointers, which
           could lead to memory corruption.
      
         - Improve metadata validation to eliminate crashing problems found
           while fuzzing xfs.
      
         - Move the error injection tag definitions into libxfs to be shared
           with userspace components.
      
         - Fix some log recovery bugs where we'd underflow log block position
           vector and incorrectly fail log recovery.
      
         - Drain the buffer lru after log recovery to force recovered buffers
           back through the verifiers after mount. On a v4 filesystem the log
           never attaches verifiers during log replay (v5 does), so we could
           end up with buffers marked verified but without having ever been
           verified.
      
         - Fix various other bugs.
      
         - Introduce the first part of a new online fsck tool. The new fsck
           tool will be able to iterate every piece of metadata in the
           filesystem to look for obvious errors and corruptions. In the next
           release cycle the checking will be extended to cross-reference with
           the other fs metadata, so this feature should only be used by the
           developers in the mean time"
      
      * tag 'xfs-4.15-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (131 commits)
        xfs: on failed mount, force-reclaim inodes after unmounting quota controls
        xfs: check the uniqueness of the AGFL entries
        xfs: remove u_int* type usage
        xfs: handle zero entries case in xfs_iext_rebalance_leaf
        xfs: add comments documenting the rebalance algorithm
        xfs: trivial indentation fixup for xfs_iext_remove_node
        xfs: remove a superflous assignment in xfs_iext_remove_node
        xfs: add some comments to xfs_iext_insert/xfs_iext_insert_node
        xfs: fix number of records handling in xfs_iext_split_leaf
        fs/xfs: Remove NULL check before kmem_cache_destroy
        xfs: only check da node header padding on v5 filesystems
        xfs: fix btree scrub deref check
        xfs: fix uninitialized return values in scrub code
        xfs: pass inode number to xfs_scrub_ino_set_{preen,warning}
        xfs: refactor the directory data block bestfree checks
        xfs: mark xlog_verify_dest_ptr STATIC
        xfs: mark xlog_recover_check_summary STATIC
        xfs: mark xfs_btree_check_lblock and xfs_btree_check_ptr static
        xfs: remove unreachable error injection code in xfs_qm_dqget
        xfs: remove unused debug counts for xfs_lock_inodes
        ...
      808eb24e
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · ae9a8c4b
      Linus Torvalds 提交于
      Pull ext4 updates from Ted Ts'o:
      
       - Add support for online resizing of file systems with bigalloc
      
       - Fix a two data corruption bugs involving DAX, as well as a corruption
         bug after a crash during a racing fallocate and delayed allocation.
      
       - Finally, a number of cleanups and optimizations.
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: improve smp scalability for inode generation
        ext4: add support for online resizing with bigalloc
        ext4: mention noload when recovering on read-only device
        Documentation: fix little inconsistencies
        ext4: convert timers to use timer_setup()
        jbd2: convert timers to use timer_setup()
        ext4: remove duplicate extended attributes defs
        ext4: add ext4_should_use_dax()
        ext4: add sanity check for encryption + DAX
        ext4: prevent data corruption with journaling + DAX
        ext4: prevent data corruption with inline data + DAX
        ext4: fix interaction between i_size, fallocate, and delalloc after a crash
        ext4: retry allocations conservatively
        ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA
        ext4: Add iomap support for inline data
        iomap: Add IOMAP_F_DATA_INLINE flag
        iomap: Switch from blkno to disk offset
      ae9a8c4b
    • L
      Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt · 32190f0a
      Linus Torvalds 提交于
      Pull fscrypt updates from Ted Ts'o:
       "Lots of cleanups, mostly courtesy by Eric Biggers"
      
      * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
        fscrypt: lock mutex before checking for bounce page pool
        fscrypt: add a documentation file for filesystem-level encryption
        ext4: switch to fscrypt_prepare_setattr()
        ext4: switch to fscrypt_prepare_lookup()
        ext4: switch to fscrypt_prepare_rename()
        ext4: switch to fscrypt_prepare_link()
        ext4: switch to fscrypt_file_open()
        fscrypt: new helper function - fscrypt_prepare_setattr()
        fscrypt: new helper function - fscrypt_prepare_lookup()
        fscrypt: new helper function - fscrypt_prepare_rename()
        fscrypt: new helper function - fscrypt_prepare_link()
        fscrypt: new helper function - fscrypt_file_open()
        fscrypt: new helper function - fscrypt_require_key()
        fscrypt: remove unneeded empty fscrypt_operations structs
        fscrypt: remove ->is_encrypted()
        fscrypt: switch from ->is_encrypted() to IS_ENCRYPTED()
        fs, fscrypt: add an S_ENCRYPTED inode flag
        fscrypt: clean up include file mess
      32190f0a
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 37dc7956
      Linus Torvalds 提交于
      Pull crypto updates from Herbert Xu:
       "Here is the crypto update for 4.15:
      
        API:
      
         - Disambiguate EBUSY when queueing crypto request by adding ENOSPC.
           This change touches code outside the crypto API.
         - Reset settings when empty string is written to rng_current.
      
        Algorithms:
      
         - Add OSCCA SM3 secure hash.
      
        Drivers:
      
         - Remove old mv_cesa driver (replaced by marvell/cesa).
         - Enable rfc3686/ecb/cfb/ofb AES in crypto4xx.
         - Add ccm/gcm AES in crypto4xx.
         - Add support for BCM7278 in iproc-rng200.
         - Add hash support on Exynos in s5p-sss.
         - Fix fallback-induced error in vmx.
         - Fix output IV in atmel-aes.
         - Fix empty GCM hash in mediatek.
      
        Others:
      
         - Fix DoS potential in lib/mpi.
         - Fix potential out-of-order issues with padata"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (162 commits)
        lib/mpi: call cond_resched() from mpi_powm() loop
        crypto: stm32/hash - Fix return issue on update
        crypto: dh - Remove pointless checks for NULL 'p' and 'g'
        crypto: qat - Clean up error handling in qat_dh_set_secret()
        crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
        crypto: dh - Don't permit 'p' to be 0
        crypto: dh - Fix double free of ctx->p
        hwrng: iproc-rng200 - Add support for BCM7278
        dt-bindings: rng: Document BCM7278 RNG200 compatible
        crypto: chcr - Replace _manual_ swap with swap macro
        crypto: marvell - Add a NULL entry at the end of mv_cesa_plat_id_table[]
        hwrng: virtio - Virtio RNG devices need to be re-registered after suspend/resume
        crypto: atmel - remove empty functions
        crypto: ecdh - remove empty exit()
        MAINTAINERS: update maintainer for qat
        crypto: caam - remove unused param of ctx_map_to_sec4_sg()
        crypto: caam - remove unneeded edesc zeroization
        crypto: atmel-aes - Reset the controller before each use
        crypto: atmel-aes - properly set IV after {en,de}crypt
        hwrng: core - Reset user selected rng by writing "" to rng_current
        ...
      37dc7956
  2. 14 11月, 2017 18 次提交