From: Linus Torvalds Date: Mon, 1 May 2017 20:34:49 +0000 (-0700) Subject: Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata X-Git-Tag: MMI-PSA29.97-13-9~5752 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e69bbe75de8ee0e732b8c009197f1a97e804d43c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'for-4.12' of git://git./linux/kernel/git/tj/libata Pull libata updates from Tejun Heo: "The biggest core change is removal of SCT WRITE SAME support, which never worked properly. Other than that, trivial updates in core code and specific embedded driver updates" * 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: libata: remove SCT WRITE SAME support libata: reject passthrough WRITE SAME requests dt-bindings: ata: add DT bindings for ahci-dm816 SATA controller ata: ahci: add support for DaVinci DM816 SATA controller pata: remove the at91 driver libata: make ata_sg_clean static over again libata: use setup_deferrable_timer ata: allow subsystem to be used on m32r and s390 archs Delete redundant return value check of platform_get_resource() ata: constify of_device_id structures --- e69bbe75de8ee0e732b8c009197f1a97e804d43c