Merge tag 'v4.20-rc6' into for-4.21/block
Pull in v4.20-rc6 to resolve the conflict in NVMe, but also to get the
two corruption fixes. We're going to be overhauling the direct dispatch
path, and we need to do that on top of the changes we made for that
in mainline.
Signed-off-by:
Jens Axboe <axboe@kernel.dk>
Showing
- Documentation/ABI/testing/sysfs-class-net-dsa 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-class-net-dsa
- Documentation/devicetree/bindings/clock/clock-bindings.txt 16 additions, 0 deletionsDocumentation/devicetree/bindings/clock/clock-bindings.txt
- Documentation/devicetree/bindings/input/input-reset.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/input/input-reset.txt
- Documentation/devicetree/bindings/media/rockchip-vpu.txt 0 additions, 29 deletionsDocumentation/devicetree/bindings/media/rockchip-vpu.txt
- Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst 25 additions, 1 deletion...mentation/media/uapi/mediactl/media-ioc-request-alloc.rst
- Documentation/media/uapi/mediactl/media-request-ioc-queue.rst 25 additions, 1 deletion...mentation/media/uapi/mediactl/media-request-ioc-queue.rst
- Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst 25 additions, 1 deletion...entation/media/uapi/mediactl/media-request-ioc-reinit.rst
- Documentation/media/uapi/mediactl/request-api.rst 25 additions, 1 deletionDocumentation/media/uapi/mediactl/request-api.rst
- Documentation/media/uapi/mediactl/request-func-close.rst 25 additions, 1 deletionDocumentation/media/uapi/mediactl/request-func-close.rst
- Documentation/media/uapi/mediactl/request-func-ioctl.rst 25 additions, 1 deletionDocumentation/media/uapi/mediactl/request-func-ioctl.rst
- Documentation/media/uapi/mediactl/request-func-poll.rst 25 additions, 1 deletionDocumentation/media/uapi/mediactl/request-func-poll.rst
- MAINTAINERS 15 additions, 1 deletionMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/Kconfig 1 addition, 12 deletionsarch/arc/Kconfig
- arch/arc/Makefile 1 addition, 1 deletionarch/arc/Makefile
- arch/arc/boot/dts/hsdk.dts 15 additions, 0 deletionsarch/arc/boot/dts/hsdk.dts
- arch/arc/configs/axs101_defconfig 2 additions, 0 deletionsarch/arc/configs/axs101_defconfig
- arch/arc/configs/axs103_defconfig 1 addition, 0 deletionsarch/arc/configs/axs103_defconfig
- arch/arc/configs/axs103_smp_defconfig 1 addition, 0 deletionsarch/arc/configs/axs103_smp_defconfig
- arch/arc/configs/hsdk_defconfig 4 additions, 0 deletionsarch/arc/configs/hsdk_defconfig
Loading
Please register or sign in to comment