Merge tag 'v3.13-rc6' into for-3.14/core
Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.
Fixup merge issues related to the immutable biovec changes.
Signed-off-by:
Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c
Showing
- CREDITS 5 additions, 0 deletionsCREDITS
- Documentation/Changes 0 additions, 11 deletionsDocumentation/Changes
- Documentation/DocBook/device-drivers.tmpl 1 addition, 1 deletionDocumentation/DocBook/device-drivers.tmpl
- Documentation/DocBook/media/v4l/vidioc-expbuf.xml 5 additions, 3 deletionsDocumentation/DocBook/media/v4l/vidioc-expbuf.xml
- Documentation/assoc_array.txt 3 additions, 3 deletionsDocumentation/assoc_array.txt
- Documentation/block/null_blk.txt 72 additions, 0 deletionsDocumentation/block/null_blk.txt
- Documentation/device-mapper/cache.txt 6 additions, 4 deletionsDocumentation/device-mapper/cache.txt
- Documentation/devicetree/bindings/arm/omap/mpu.txt 8 additions, 0 deletionsDocumentation/devicetree/bindings/arm/omap/mpu.txt
- Documentation/devicetree/bindings/arm/pmu.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/arm/pmu.txt
- Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/samsung/exynos-adc.txt
- Documentation/devicetree/bindings/clock/exynos4-clock.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/clock/exynos4-clock.txt
- Documentation/devicetree/bindings/clock/exynos5250-clock.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/clock/exynos5250-clock.txt
- Documentation/devicetree/bindings/clock/exynos5420-clock.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/clock/exynos5420-clock.txt
- Documentation/devicetree/bindings/clock/exynos5440-clock.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/clock/exynos5440-clock.txt
- Documentation/devicetree/bindings/gpio/8xxx_gpio.txt 40 additions, 26 deletionsDocumentation/devicetree/bindings/gpio/8xxx_gpio.txt
- Documentation/devicetree/bindings/i2c/i2c-omap.txt 2 additions, 1 deletionDocumentation/devicetree/bindings/i2c/i2c-omap.txt
- Documentation/devicetree/bindings/mmc/ti-omap.txt 54 additions, 0 deletionsDocumentation/devicetree/bindings/mmc/ti-omap.txt
- Documentation/devicetree/bindings/net/davinci_emac.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/davinci_emac.txt
- Documentation/devicetree/bindings/net/fsl-fec.txt 2 additions, 0 deletionsDocumentation/devicetree/bindings/net/fsl-fec.txt
- Documentation/devicetree/bindings/net/smsc-lan91c111.txt 4 additions, 0 deletionsDocumentation/devicetree/bindings/net/smsc-lan91c111.txt
Please register or sign in to comment